tree d02ffd841a9885be879ace17596b94bfa13f7d93
parent 6475738243e4b2df74b92a4120e3b942ddedc0bd
parent 5a096ecf5a20d104829ff867159b9f16d904708c
author Bill Peckham <bpeckham@google.com> 1570247110 -0700
committer android-build-merger <android-build-merger@google.com> 1570247110 -0700

Merge "Moving recovery resources from /system to /vendor" am: 3903b26368 am: 1bf401d03f am: c1eef556dc
am: 5a096ecf5a

Change-Id: I56923c156eeda064494f6a873f2aaed4524fd39c