tree e67ba5fcacecaafbfafb57ecc67c7c8fcea4c6d3
parent 58a1ca6642d404b67e5c9e75076b9bbe08e4076b
parent dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29
author Kenny Root <kroot@google.com> 1360875034 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360875034 -0800

am dc7b3e3b: am 9657ba0e: Merge "KeyStore: stop using state()"

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