OSDN Git Service

am 51323155: (-s ours) am 2a1697d9: am 8d212ea8: DO NOT MERGE: Change verity key...
authorSami Tolvanen <samitolvanen@google.com>
Fri, 14 Nov 2014 19:17:46 +0000 (19:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Nov 2014 19:17:46 +0000 (19:17 +0000)
* commit '5132315546c52cedbdcb102bcf6e7ff83d7c4839':
  DO NOT MERGE: Change verity key formats


Trivial merge