tree 69bca6f15fac4de545b553ebad4c855231aa33c6
parent 9fdd2778113aa1893320027870d422d69ba8b237
parent eef252881a9194777399d2dc4ece744b3407129c
author Kenny Root <kroot@google.com> 1360878285 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360878285 -0800

am eef25288: Merge "KeyStore: stop using state()"

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