| commit | 5c1a40b6bfeee792f6c61f5e613b51810f057fd0 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Feb 26 23:55:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 23:55:40 2015 +0000 |
| tree | f136568de40380f2fa0931b1478c683ca5141425 | |
| parent | b9ef56d23c1d3d9faf6f49208326933a5b28e8b6 [diff] | |
| parent | e0d5bed3978db3cc9d735a3f4a4dff0f33b6aeee [diff] |
am e0d5bed3: am a436d979: am 01062fca: Merge "Separate keymaster0 and keymaster1 HALs." * commit 'e0d5bed3978db3cc9d735a3f4a4dff0f33b6aeee': Separate keymaster0 and keymaster1 HALs.