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