| commit | f1d456fba9e680d2a7dff069b45b3a44f197ec56 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Apr 10 04:35:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 04:35:12 2015 +0000 |
| tree | 092cfd64f232c68c35ffda2192b6ac88dd7d5dc8 | |
| parent | 4514f80822d8110dc17da795cdf33d8772a9ff55 [diff] | |
| parent | 7b12e5560c423ff02164a5cb8b5bbefd5a123e84 [diff] |
am 7b12e556: am 5e58787b: Merge "Reduce keymaster block modes to the required set." * commit '7b12e5560c423ff02164a5cb8b5bbefd5a123e84': Reduce keymaster block modes to the required set.