tree b11b84750d20ba8aa02cffdbc490f8f6a94c7db9
parent d1e308cf87d6ea9e428c58fa3644083f7835636a
parent 3bad7fe9d311844dd6533c73630d6cb7e4da785a
author Kenny Root <kroot@google.com> 1360878286 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360878286 -0800

am 3bad7fe9: Merge "KeyStore: stop using state()"

# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '3bad7fe9d311844dd6533c73630d6cb7e4da785a':
  KeyStore: stop using state()