tree 047a426860d28c16ecebb832bd69c5b04c0f1b45
parent 5e7697a45979940c6226f71281fb48c892d210cd
parent d82af7d2809f60e5c6f41233b45374b04e60e370
author Tianjie Xu <xunchang@google.com> 1506033072 +0000
committer android-build-merger <android-build-merger@google.com> 1506033072 +0000

Merge "update the recovery background image with new translation" am: c0123e0c3a am: 6a5204ac8d am: 9425dba5b3
am: d82af7d280

Change-Id: Ib7940fd0ab701235d178c2e6f11b34037db9b444