tree 00cedf96a720ccd9b2bf1784618d4a160b9cf459
parent 8298b7f649063dcbe3f857c21fcb609adf74f179
parent f98523955f522795c8079d5b9533a4e0aecda8b7
author Deepanshu Gupta <deepanshu@google.com> 1399060659 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399060659 +0000

am f9852395: am 00251f77: am d1830eb6: am 57e410d9: (-s ours) am 9f81e73a: am 28ec8b4f: am 0a37981c: (-s ours) am 1b28d8d4: am d642de58: am ec4623d0: Improve text rendering and measurement. [DO NOT MERGE]

* commit 'f98523955f522795c8079d5b9533a4e0aecda8b7':
  Improve text rendering and measurement. [DO NOT MERGE]