| commit | 3167fb4b6e190705d21a76b34cc376a89675a6a0 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Apr 24 18:11:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 24 18:11:50 2015 +0000 |
| tree | 0bab9493e489ecffd275c320d2ffd14169ba0e23 | |
| parent | 6d856bfba5b6ae488d49c4909510cd87000cd922 [diff] | |
| parent | 71223ebe1b2264b7463a02c8dafd779eb3b8c210 [diff] |
am 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails." * commit '71223ebe1b2264b7463a02c8dafd779eb3b8c210': Reset AndroidKeyStore Mac and Cipher state when init fails.