tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 80af5bd37581df0bb880b4c109df196c5bf8c05b
parent dd5f0e7cc4bb6ff40e91568fbda0861f278bbeca
author Winson Chung <winsonc@google.com> 1392411599 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411599 +0000

am dd5f0e7c: am fba5ecd8: am f4b68852: am 3eb3b27a: am 54000490: Ensuring that we are calling setCompoundDrawable() instead of using intrinsic bounds. (Bug 11203738)

* commit 'dd5f0e7cc4bb6ff40e91568fbda0861f278bbeca':