tree 47d80b337d94f27daad12ebfbb959d0566f19b9e
parent b6faf00b9b32dcc0a4d36a2addb7e3d6fedf35db
parent e890e194d7861307722a39b8689894ce600be2cb
author Tianjie Xu <xunchang@google.com> 1461809488 +0000
committer android-build-merger <android-build-merger@google.com> 1461809488 +0000

Merge "Update background text for recovery UI" into nyc-dev am: eeca191
am: e890e19

* commit 'e890e194d7861307722a39b8689894ce600be2cb':

Change-Id: Ib4869307f14f836ebe6066d4e406c46ac0193de6