tree e2027927bc548d48902768bfe38cf89688e414b2
parent 73852ff056b8dc16c874ae94caaa77c20e2cc42b
parent 2c4d3a7b6c548f299ecda9d440133208dfd0ae5e
author Bill Peckham <bpeckham@google.com> 1570246261 -0700
committer android-build-merger <android-build-merger@google.com> 1570246261 -0700

Merge "Moving recovery resources from /system to /vendor" am: 959b5ebbf8
am: 2c4d3a7b6c

Change-Id: Ibcb1f7ca8e41c1f524d26455a7e926eedd919edf