| commit | a19ff28c8fa321cd07f3ed92d270f08a0b2bfe6c | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Fri Mar 13 18:26:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 13 18:26:11 2015 +0000 |
| tree | b1f7764b87892d173c9df76b7b09f6b5555d779f | |
| parent | 4011e209215d19a1633ed5d1643f3b7643001667 [diff] | |
| parent | 99e9acd9402679e28e6f4c3ee71cef2cc91b3311 [diff] |
am 99e9acd9: am f1654c60: Merge "Add initial Keymaster 1.0 tests" * commit '99e9acd9402679e28e6f4c3ee71cef2cc91b3311': Add initial Keymaster 1.0 tests