| commit | 55eb5b0caf1eff3f50b7e8f86b7ff24a978be044 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Feb 27 00:43:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 00:43:17 2015 +0000 |
| tree | 1dfa611bb95c19eae769351ad1a91ffaaf41cc0f | |
| parent | ffaaf821c0845760cdf41c0bb3107db4ccb3a7fa [diff] | |
| parent | e05ffdbb306d5e5b615a7e7a65c665010211b9b6 [diff] |
am e05ffdbb: am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs." * commit 'e05ffdbb306d5e5b615a7e7a65c665010211b9b6': Separate keymaster0 and keymaster1 HALs.