Commit c25d8adf authored by Daniel Xie's avatar Daniel Xie Committed by android-build-merger
Browse files

Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev 

automerge: 977acac8

* commit '977acac8':
  Skip TimaKeyStore in KeyStoreTest
parents 2cc18704 977acac8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment