| commit | 1acfedf9cc1e5b4ef9da4da7302ec09366acb8b4 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Feb 26 23:31:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 23:31:13 2015 +0000 |
| tree | 30be577e39b57c2f2723895c64c392056617bad7 | |
| parent | b711998fe52c2e4f81fcf7b440efbb3b9debee7b [diff] | |
| parent | 370cb89f128c78e3bb4ae8afd1e35699fce9370b [diff] |
am 370cb89f: Merge "Separate keymaster0 and keymaster1 HALs." * commit '370cb89f128c78e3bb4ae8afd1e35699fce9370b': Separate keymaster0 and keymaster1 HALs.