| commit | a899066c86e070883011c6693b1d7755d3e68111 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Apr 10 04:35:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 04:35:14 2015 +0000 |
| tree | d1e70b04882e36c2174f5bb5216999b61d8fef93 | |
| parent | 136905aee4464d892b3ebc8d5f9128b9a21fdc29 [diff] | |
| parent | b0759b61f8714fb2ff3aa6f89f60e55a3d878ec5 [diff] |
am b0759b61: am def4b59e: Merge "Reduce the list of keymaster padding modes to the required set." * commit 'b0759b61f8714fb2ff3aa6f89f60e55a3d878ec5': Reduce the list of keymaster padding modes to the required set.