OSDN Git Service

am 3167fb4b: am 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when...
authorAlex Klyubin <klyubin@google.com>
Fri, 24 Apr 2015 18:21:22 +0000 (18:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Apr 2015 18:21:22 +0000 (18:21 +0000)
commitedf5454a14cc53de92eaf1ef15fcfb21d8caccca
treec84422d8789733fd3bf0c7ae7351db84251dd317
parent3846d3a4c5d79a9d7e86e43c64a5c21a29036de0
parent3167fb4b6e190705d21a76b34cc376a89675a6a0
am 3167fb4b: am 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."

* commit '3167fb4b6e190705d21a76b34cc376a89675a6a0':
  Reset AndroidKeyStore Mac and Cipher state when init fails.