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

* commit 'fba5ecd8e265e099830560d3edf2d6e38437fab1':