am 7c1c4600: Merge change I425ca595 into eclair

Merge commit '7c1c46000be136ffda36283fdc93bfe3cba72601' into eclair-plus-aosp

* commit '7c1c46000be136ffda36283fdc93bfe3cba72601':
  Fix 2261626: Don't show text on button if orientation is vertical.