| commit | 3a6417d165861bd93fa1d07410c61995024a0e04 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Feb 27 00:51:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 00:51:42 2015 +0000 |
| tree | 56b3b763522ac271a319cc6c31f974397318becc | |
| parent | ae7edf23730e503bdd97de2a6cb639075f47cf68 [diff] | |
| parent | 55eb5b0caf1eff3f50b7e8f86b7ff24a978be044 [diff] |
am 55eb5b0c: am e05ffdbb: am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs." * commit '55eb5b0caf1eff3f50b7e8f86b7ff24a978be044': Separate keymaster0 and keymaster1 HALs.