commit | bde6c2bb3fca4bc0665701ac99fa2b5b9673a6d6 | [log] [tgz] |
---|---|---|
author | Shawn Willden <swillden@google.com> | Thu Jan 22 21:36:14 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 22 21:36:14 2015 +0000 |
tree | 6473f2ad8de20a27ac6db24adcae42cbf5f90756 | |
parent | 1d1bf8b5f648abad900b16eabdfd0813e5d6a6a2 [diff] | |
parent | b1a1218845eb32564b2f7f0297096ec43b27e41b [diff] |
am b1a12188: Merge "Define keymaster HAL v0.4." * commit 'b1a1218845eb32564b2f7f0297096ec43b27e41b': Define keymaster HAL v0.4.