commit | 4a551dbca528d5a3b0cf28e53d05cd681b5fe157 | [log] [tgz] |
---|---|---|
author | Shawn Willden <swillden@google.com> | Thu Feb 26 23:31:07 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 23:31:07 2015 +0000 |
tree | 9e7c43db1e96609fa9c5eb327c7823dcca9cfed0 | |
parent | d2ff5083f9f4a404c5fa616ce1a4fcf3f201d65b [diff] | |
parent | 98e9075571d41904c86ed7d78aabef32eac6068f [diff] |
am 98e90755: Merge "Separate keymaster0 and keymaster1 HALs." * commit '98e9075571d41904c86ed7d78aabef32eac6068f': Separate keymaster0 and keymaster1 HALs.