diff options
author | Daniel Xie <dxie@google.com> | 2015-09-15 01:10:08 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-15 01:10:08 +0000 |
commit | 13405d7548b81316bb154483b666f0370ff410a1 (patch) | |
tree | 4a38d981fef0682951f25a6cbb588105046dd40e /tzdata/update_test_app/AndroidManifest.xml | |
parent | 0723875605a82af0c973bb583e2526e1e61a7621 (diff) | |
parent | 55b43a5c0203cfb5bab43c94be4ad411fa28812d (diff) | |
download | libcore-13405d7548b81316bb154483b666f0370ff410a1.zip libcore-13405d7548b81316bb154483b666f0370ff410a1.tar.gz libcore-13405d7548b81316bb154483b666f0370ff410a1.tar.bz2 |
am 55b43a5c: am 141d6fed: am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev
* commit '55b43a5c0203cfb5bab43c94be4ad411fa28812d':
Diffstat (limited to 'tzdata/update_test_app/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions