| commit | 1d48298d6933e61f5f163ba92afe4bee0fb9b1f5 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Thu Mar 05 19:53:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 05 19:53:35 2015 +0000 |
| tree | f136568de40380f2fa0931b1478c683ca5141425 | |
| parent | 8529cadc46150bc9bddc2844653f0eb5d253b148 [diff] | |
| parent | c451fe041c7c67cb111948c9c615b0cd99830d6a [diff] |
am c451fe04: (-s ours) am 056ef407: am b060ae05: Merge "Revert "Add Keymaster 0.4 binder methods"" * commit 'c451fe041c7c67cb111948c9c615b0cd99830d6a': Revert "Add Keymaster 0.4 binder methods"