OSDN Git Service

am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image."
authorNick Kralevich <nnk@google.com>
Fri, 30 May 2014 18:27:03 +0000 (18:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 May 2014 18:27:03 +0000 (18:27 +0000)
* commit '1df5b37b5b73324300ae1b5f255c1a772c65328a':
  Use a separate policy for the recovery image.

1  2 
core/Makefile

diff --cc core/Makefile
Simple merge