tree 022a388a80e32aa666482968f03917094b5c2355
parent 4b8bbb95aba1d6f3e3151ab4f0194daec9fdb2ea
parent 6a5204ac8d533d5e32ae7d47296bc53dbc03b03c
author Tianjie Xu <xunchang@google.com> 1506031922 +0000
committer android-build-merger <android-build-merger@google.com> 1506031922 +0000

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

Change-Id: I1ca72cab196f5c37f792d3728acfebdf4a781058