| commit | 4822b351636758cab5df191f001a0c79971a6343 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 01 10:06:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 10:06:48 2015 +0000 |
| tree | 6770798b4a4f67f62a5450ac91c94dc8f51a197a | |
| parent | 36b4a5f907854da22751a497502bb87d384bb88f [diff] | |
| parent | 24a2048498e80cbc8602f56169d9f6875ddb9488 [diff] |
am 24a20484: am edef8836: am c25d8adf: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev automerge: 977acac * commit '24a2048498e80cbc8602f56169d9f6875ddb9488':