| commit | a436d9796ae367e70db73e9f716feead6639661b | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Feb 26 23:31:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 23:31:08 2015 +0000 |
| tree | 050811ad2e270fdfd845e4d64e87d09b3459b024 | |
| parent | e732de519d001335310ae4ba32095130850e97a7 [diff] | |
| parent | 01062fcafada76b99e6a01bc57ca5391ae99ce76 [diff] |
am 01062fca: Merge "Separate keymaster0 and keymaster1 HALs." * commit '01062fcafada76b99e6a01bc57ca5391ae99ce76': Separate keymaster0 and keymaster1 HALs.