commit | e05ffdbb306d5e5b615a7e7a65c665010211b9b6 | [log] [tgz] |
---|---|---|
author | Shawn Willden <swillden@google.com> | Thu Feb 26 23:31:14 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 23:31:14 2015 +0000 |
tree | 1dfa611bb95c19eae769351ad1a91ffaaf41cc0f | |
parent | 587d8313d6d9d9f44ac2d8702676c02c792e1bf3 [diff] | |
parent | 17dde875dda1b96722e6fb07850c268ca716c3d1 [diff] |
am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs." * commit '17dde875dda1b96722e6fb07850c268ca716c3d1': Separate keymaster0 and keymaster1 HALs.