tree 56eaef77944eb4b9b2d8e8b6414f601630fd2194
parent d24d9e494429d74089a2060e7500d52fd9b10f7c
parent 76734915c701cd5e0fd13bb3dfe7212a2b5dfbb6
author Android Build Merger (Role) <android-build-merger@google.com> 1461200888 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461200888 +0000

Merge "Merge "Regenerate background text imgs in recovery" into nyc-dev am: df093c1512 am: 4cc6145423" into nyc-mr1-dev-plus-aosp