| commit | f98099afe24ffa2dcc5b364983354d1b75f77ace | [log] [tgz] |
|---|---|---|
| author | Sami Tolvanen <samitolvanen@google.com> | Fri Nov 14 19:17:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 14 19:17:46 2014 +0000 |
| tree | 558e3a8e969088fc34f3a1722c9bf285b212a379 | |
| parent | b2340dea94eefae1ebaafcb09fdfc12838887c17 [diff] | |
| parent | 5132315546c52cedbdcb102bcf6e7ff83d7c4839 [diff] |
am 51323155: (-s ours) am 2a1697d9: am 8d212ea8: DO NOT MERGE: Change verity key formats * commit '5132315546c52cedbdcb102bcf6e7ff83d7c4839': DO NOT MERGE: Change verity key formats