tree 55882a40ca78dc961f9e14fe80bf8aa8c2594b38
parent 650d30c5ec3c0b345651a56c45eb334fabf51b17
parent 5800b19a7a3422620cb28e2327a96bf824f5cc9c
author Deepanshu Gupta <deepanshu@google.com> 1391655821 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391655821 +0000

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

* commit '5800b19a7a3422620cb28e2327a96bf824f5cc9c':
  Fix the measurement of text bounds.