OSDN Git Service

am 2a1697d9: am 8d212ea8: DO NOT MERGE: Change verity key formats
authorSami Tolvanen <samitolvanen@google.com>
Fri, 14 Nov 2014 00:03:51 +0000 (00:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Nov 2014 00:03:51 +0000 (00:03 +0000)
* commit '2a1697d9831fc887a32c661fa4e3758f32790e67':
  DO NOT MERGE: Change verity key formats

1  2 
core/Makefile

diff --cc core/Makefile
Simple merge