tree 1277c2393a27b7146cae657e1bfc6e5a336dc936
parent 3789b2fb823b7632e410c0191ddf77dc1e875196
parent 133c5f5e91e72cff1a9a3a4903a0efc96b39165b
author Kenny Root <kroot@google.com> 1360019422 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360019422 -0800

am 133c5f5e: Merge "AndroidKeyStore: fix tests"

# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '133c5f5e91e72cff1a9a3a4903a0efc96b39165b':
  AndroidKeyStore: fix tests