| commit | e3abd16332f73329634f9bd8f0896027ec406438 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Thu Mar 05 19:36:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 05 19:36:33 2015 +0000 |
| tree | f136568de40380f2fa0931b1478c683ca5141425 | |
| parent | 5c1a40b6bfeee792f6c61f5e613b51810f057fd0 [diff] | |
| parent | 7a7aa6612416343bd88f7bc52fccb7b0a33c51d1 [diff] |
am 7a7aa661: (-s ours) am 475e05fb: am cbafa3d3: Merge "Add Keymaster 0.4 binder methods" * commit '7a7aa6612416343bd88f7bc52fccb7b0a33c51d1': Add Keymaster 0.4 binder methods