tree 3b04ebc1aec2dabb54b5b37193cbe1902d3aa541
parent 6a82bc228a1001990d7fe95e36f52c37125d93cf
parent b037cff12eedd61e9afc04ec4d60f4c399830d2e
author Tianjie Xu <xunchang@google.com> 1485205086 +0000
committer android-build-merger <android-build-merger@google.com> 1485205086 +0000

Merge "Restore the max width for recovery background texts" am: c1df344381
am: b037cff12e

Change-Id: I177c4d5edcf8e0ee9874bd1627d0ae12a43ae506