| commit | 7b12e5560c423ff02164a5cb8b5bbefd5a123e84 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Apr 10 02:43:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 02:43:23 2015 +0000 |
| tree | 778730738c471006da555481b0fd312797fe4d06 | |
| parent | bc0360838fdf7945f99bc600813e5342f53c9790 [diff] | |
| parent | 5e58787ba05538a75207c2bb6a26528c96535626 [diff] |
am 5e58787b: Merge "Reduce keymaster block modes to the required set." * commit '5e58787ba05538a75207c2bb6a26528c96535626': Reduce keymaster block modes to the required set.