diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-24 18:11:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 18:11:50 +0000 |
| commit | 3167fb4b6e190705d21a76b34cc376a89675a6a0 (patch) | |
| tree | 0bab9493e489ecffd275c320d2ffd14169ba0e23 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| 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.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions