tree 2819d0df63ebb34bd29d50d1fb81fc77d9581d47
parent 325260d6f4314db7712c3eb1c146477f80ff74ef
parent 45811d2e4f8302f8710d054f8aa1fe94bd05d6b3
author Mindy Pereira <mindyp@google.com> 1365535888 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365535888 -0700

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

* commit '7e12aaa7748c44952d91b88c6f2863c16fe06deb':