tree ae23c2cbf4ecbb3653722bc7f973eefc0c748a61
parent 1a18195338b0cfc6b9d5c1826fcd91612beb7091
parent 97e01b9eba71e1f7e4348bb9ead3daaf02fe3c66
author Mindy Pereira <mindyp@google.com> 1367354908 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367354908 -0700

am 327b11ab: am 7e12aaa7: am dd5c5cf8: Use ALIGN_BOTTOM instead of ALIGN_BASELINE

* commit '327b11abdb95a185b0e39d48a9a315a615d962a1':