tree c884c6691e9aff6cf18f35b6e0c9b0187a702187
parent 638af2fbb6ecb6ca0e58b06d5b2c6ecabbc7f812
parent 516fab2404f550aca03b3774bd5b279d4e69dd9f
author Kenny Root <kroot@google.com> 1360019521 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360019521 -0800

am 516fab24: am 133c5f5e: Merge "AndroidKeyStore: fix tests"

# Via Android Git Automerger (1) and others
* commit '516fab2404f550aca03b3774bd5b279d4e69dd9f':
  AndroidKeyStore: fix tests