| commit | cc521eada2f2926791eb42a369a1e2151fe18a33 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Apr 10 02:43:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 02:43:26 2015 +0000 |
| tree | e5268a3cb3cadfb859306d3d79e6dd8e435beaea | |
| parent | b0759b61f8714fb2ff3aa6f89f60e55a3d878ec5 [diff] | |
| parent | 3f3b9790739a287223cfd63bc72e6b19635dced5 [diff] |
am 3f3b9790: Merge "Reduce the list of keymaster key formats to the required set." * commit '3f3b9790739a287223cfd63bc72e6b19635dced5': Reduce the list of keymaster key formats to the required set.