tree 537d75f3df8ffe70d7512cfe320e056b9d66fbc9
parent 4e5c08d42063f21655c9f9bc96bf2f91eb6e8d6f
parent 46c48a0c34dfafde4cd55956ffbb9251a1cdac02
author Nick Kralevich <nnk@google.com> 1401476497 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401476497 +0000

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

* commit '46c48a0c34dfafde4cd55956ffbb9251a1cdac02':
  Use a separate policy for the recovery image.