tree 3b04ebc1aec2dabb54b5b37193cbe1902d3aa541
parent 8157166107913f800c3bcd67c80372251cb42e12
parent f1a371b1b002d8ca19bb1ecf3d40547c52fa3706
author Tianjie Xu <xunchang@google.com> 1485205927 +0000
committer android-build-merger <android-build-merger@google.com> 1485205927 +0000

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

Change-Id: I9de47dbda98fab48b82f99ebecee2d01f70526c5