tree 954ddbce66798d137c74bc773b56775900c43b11
parent fe5294ad74bb9ad323a9337b67a4f9a3f0aac3b1
parent 9460bb2c3df9e985c14d2dd76b03aefb3333b251
author Elliott Hughes <enh@google.com> 1427237926 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427237926 +0000

am 9460bb2c: Merge "Fix recovery image text rendering."

* commit '9460bb2c3df9e985c14d2dd76b03aefb3333b251':
  Fix recovery image text rendering.