| commit | bc0360838fdf7945f99bc600813e5342f53c9790 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Apr 10 00:06:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 00:06:36 2015 +0000 |
| tree | 777f4dc3185e78333e825f8d792e9f6a4ba749ef | |
| parent | 2d19dbfed66adff49d58231483a887c6dd63a7b8 [diff] | |
| parent | 1d9de3e6eb1fbc2f6704e2c415439cb7869ec47b [diff] |
am 1d9de3e6: Merge "Reduce keymaster algorithm list to the required set." * commit '1d9de3e6eb1fbc2f6704e2c415439cb7869ec47b': Reduce keymaster algorithm list to the required set.