OSDN Git Service

am edf5454a: am 3167fb4b: am 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher...
authorAlex Klyubin <klyubin@google.com>
Fri, 24 Apr 2015 18:35:37 +0000 (18:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Apr 2015 18:35:37 +0000 (18:35 +0000)
commit9716b081a6174823d8fb49576e62382e953a1c98
treec6578bf847ccc6175d0293e07d6767a7fdab30c7
parenta298a96af77f0cb638b4e2be2ab762d0183ee813
parentedf5454a14cc53de92eaf1ef15fcfb21d8caccca
am edf5454a: am 3167fb4b: am 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."

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