summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-09-04 22:19:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-04 22:19:19 +0000
commit2ab5a4898ae61056b8eee8231f0761245dd93295 (patch)
tree299434f810e5e249959f228350541098f1d84f92
parent5181c7732c3e5db6bff9505470ae4a7db9fc6718 (diff)
parent45101b8ebb8d2261c1733d305f5e165971ef7dc1 (diff)
downloadlibcore-2ab5a4898ae61056b8eee8231f0761245dd93295.zip
libcore-2ab5a4898ae61056b8eee8231f0761245dd93295.tar.gz
libcore-2ab5a4898ae61056b8eee8231f0761245dd93295.tar.bz2
am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev
* commit '45101b8ebb8d2261c1733d305f5e165971ef7dc1':
0 files changed, 0 insertions, 0 deletions