tree 3a196729bd23efe6014ae6332443cbde19a1aa09
parent ca93a1f5294288e0e0193e111874ca557801ce15
parent 9425dba5b3da1ddb177125be499fcbc95415b6da
author Tianjie Xu <xunchang@google.com> 1506032439 +0000
committer android-build-merger <android-build-merger@google.com> 1506032439 +0000

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

Change-Id: I580b4c95e20493484cb039f9421abe8f22b4301f