tree fd2af7a97a0bb5a16e2a91d4b8c558f13b2e089a
parent b873a0a3abc504b3c6b8db51ea8f3bcb97bc3ac7
parent 97114e606219b6d44bb377410f15a0fe9732dd35
author Deepanshu Gupta <deepanshu@google.com> 1397677480 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397677480 +0000

am 97114e60: am 13ed576e: am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev

* commit '97114e606219b6d44bb377410f15a0fe9732dd35':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]