| commit | e3b89a9c43ca58539c24226eaa6ec30bceb51673 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Jan 22 21:41:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 22 21:41:28 2015 +0000 |
| tree | 743e895e04fbcf51229db1bcf68546d69be6c062 | |
| parent | 53e64c2cbeec50d1c26ca2b198d5125f001b7fb3 [diff] | |
| parent | bde6c2bb3fca4bc0665701ac99fa2b5b9673a6d6 [diff] |
am bde6c2bb: am b1a12188: Merge "Define keymaster HAL v0.4." * commit 'bde6c2bb3fca4bc0665701ac99fa2b5b9673a6d6': Define keymaster HAL v0.4.