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

* commit 'c3fa14e78ab0d973b3bd2646bf5ed5aad860fcfb':