tree 2bd3bbb1b2cb77ac4176b8c29ef7f16c2ce49dd7
parent 4774b0208ef1ad3a8dc1b50590a9cb4e86f11cc8
parent 79a806525a1e74191601a97e39d81c4b2727a54c
author Kenny Root <kroot@google.com> 1360875034 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360875034 -0800

am dc7b3e3b: am 79a80652: Merge "KeyStore: stop using state()"

# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
  KeyStore: stop using state()