| commit | b0759b61f8714fb2ff3aa6f89f60e55a3d878ec5 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Apr 10 02:43:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 02:43:25 2015 +0000 |
| tree | 054674f7d9e71cc68b5292dc7769b22ae01a0d58 | |
| parent | 4821c01e1c6bcb117cea0b59d976b23bf3664972 [diff] | |
| parent | def4b59e69942bc22cda10448c8e8ee2417a186a [diff] |
am def4b59e: Merge "Reduce the list of keymaster padding modes to the required set." * commit 'def4b59e69942bc22cda10448c8e8ee2417a186a': Reduce the list of keymaster padding modes to the required set.