summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-09-01 09:14:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-01 09:14:48 +0000
commitedef8836113a0fd3f9b72be99ed997eebf7809ba (patch)
tree6ccbb06274c0e5ab0d2e7bdf6f43613478b61ae2
parentdd2f751a6d7e0ab6a3ec89b025bd58194611cb62 (diff)
parentc25d8adf4bc85882d0f18858db3724039e5affa5 (diff)
downloadlibcore-edef8836113a0fd3f9b72be99ed997eebf7809ba.zip
libcore-edef8836113a0fd3f9b72be99ed997eebf7809ba.tar.gz
libcore-edef8836113a0fd3f9b72be99ed997eebf7809ba.tar.bz2
am c25d8adf: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev automerge: 977acac
* commit 'c25d8adf4bc85882d0f18858db3724039e5affa5': Skip TimaKeyStore in KeyStoreTest
0 files changed, 0 insertions, 0 deletions