tree 3e8036136adde4c420932270bc17c99b1263a53d
parent 157dae465d0190edb0fb0bed8ad779cadd755faf
parent 1f2b629a224e675b9a2eaa7e44d0d6c5701046a1
author Daniel Xie <dxie@google.com> 1437152587 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437152587 +0000

am 1f2b629a: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev automerge: 977acac automerge: c25d8ad

* commit '1f2b629a224e675b9a2eaa7e44d0d6c5701046a1':
  Skip TimaKeyStore in KeyStoreTest