tree b4a275d11c7d8f5cf6084cac1028fdcd0f8a3275
parent c881a5a12c100889082df66fbe18d9afc131fa7d
parent d4eaa4a1746ab9f5944980009dcdfd003a897d91
author Bill Peckham <bpeckham@google.com> 1570246706 -0700
committer android-build-merger <android-build-merger@google.com> 1570246706 -0700

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

Change-Id: Ic57684498068179d15291768b725ca66b1efa614