tree fd43641e01bd5a1334b5bff319688cde999bfa30
parent b156c0197d052dd4be71ad2b858acc01f50ad49f
parent 50b0ce4e8ed353ed841782aeb58963bc084f2e16
author Deepanshu Gupta <deepanshu@google.com> 1391655581 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391655581 +0000

am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev

* commit '50b0ce4e8ed353ed841782aeb58963bc084f2e16':
  Fix the measurement of text bounds.