tree 03db885fad04caf93998e557f4439f72b22ae435
parent 5ac5cd7300fda7cb80ae0fb3d66594abd4f91939
parent 1b15acf705a6bcca333b1e8a6a48039242cc7d57
author Daniel Sandler <dsandler@android.com> 1260219061 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260219061 -0800

am 1b15acf7: Merge change I21eb4b87 into eclair-mr2

Merge commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57' into eclair-mr2-plus-aosp

* commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57':
  Allow room for descenders in am/pm text.