tree b4a275d11c7d8f5cf6084cac1028fdcd0f8a3275
parent 3142a85a55a8aa91b8dc803c7b86a4ebb5bbd1b9
parent bff3aed7c5dc237411dad9c7bdf38de3a3b2d292
author Bill Peckham <bpeckham@google.com> 1570247135 -0700
committer android-build-merger <android-build-merger@google.com> 1570247135 -0700

Merge "Moving recovery resources from /system to /vendor" am: 2d7de3d682 am: 519e85b5f3 am: d4eaa4a174
am: bff3aed7c5

Change-Id: I21e5c969a206f4bb60e42cae535b34e3e5cdec1b