tree fed30ff79a141cd9ab835a2dc93679f207aee504
parent 4410c0348ced5776e5203310c191f8ef3680d9a0
parent 281fa9fd303bbc8eca423f1ceb28e38111ca0376
author Tianjie Xu <xunchang@google.com> 1485206115 +0000
committer android-build-merger <android-build-merger@google.com> 1485206115 +0000

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

Change-Id: I109593352d526941895eafea41f87a49561f8fd7