summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-09-01 10:06:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-01 10:06:48 +0000
commit4822b351636758cab5df191f001a0c79971a6343 (patch)
tree6770798b4a4f67f62a5450ac91c94dc8f51a197a
parent36b4a5f907854da22751a497502bb87d384bb88f (diff)
parent24a2048498e80cbc8602f56169d9f6875ddb9488 (diff)
downloadlibcore-4822b351636758cab5df191f001a0c79971a6343.zip
libcore-4822b351636758cab5df191f001a0c79971a6343.tar.gz
libcore-4822b351636758cab5df191f001a0c79971a6343.tar.bz2
am 24a20484: am edef8836: am c25d8adf: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev automerge: 977acac
* commit '24a2048498e80cbc8602f56169d9f6875ddb9488':
0 files changed, 0 insertions, 0 deletions