am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image."
am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image."

* commit '1df5b37b5b73324300ae1b5f255c1a772c65328a':
  Use a separate policy for the recovery image.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build