tree ea5b8843ac487859529ca141ad910aea805313c6
parent 6e284891b9833d648b2ace0415fc22646c3e1c01
parent 805292f76435b0ca14fcfcd192884bbbaf77a424
author Tianjie Xu <xunchang@google.com> 1462218194 +0000
committer android-build-merger <android-build-merger@google.com> 1462218194 +0000

Merge "Make text for recovery larger on angler am: 087c5edd8d am: 26f5ab0e9c" into nyc-mr1-dev-plus-aosp
am: 805292f764

* commit '805292f76435b0ca14fcfcd192884bbbaf77a424':

Change-Id: I31c9407e924503371ca97208a7592fb617a4dd98