tree 180870e81319c2263d6810fbd0502219cf39259c
parent 519e77bbf26e0a6ea10f6e94c5b86c4c2d57c633
parent d60d0c1ce70a83263daa91d7c4c44d73878e6696
author Deepanshu Gupta <deepanshu@google.com> 1399058613 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399058613 +0000

am d60d0c1c: (-s ours) am f5512973: am fe675441: am ce22440d: Fix text rendering [DO NOT MERGE]

* commit 'd60d0c1ce70a83263daa91d7c4c44d73878e6696':
  Fix text rendering [DO NOT MERGE]