| commit | 9716b081a6174823d8fb49576e62382e953a1c98 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Apr 24 18:35:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 24 18:35:37 2015 +0000 |
| tree | c6578bf847ccc6175d0293e07d6767a7fdab30c7 | |
| parent | a298a96af77f0cb638b4e2be2ab762d0183ee813 [diff] | |
| parent | edf5454a14cc53de92eaf1ef15fcfb21d8caccca [diff] |
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.