| commit | 628c6de7e0560ecb081743a36612ff529d84a26b | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Mon Jun 15 22:58:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 15 22:58:30 2015 +0000 |
| tree | 0d83c47f50c4b9d5ba4f99ee49e5523f7693c4aa | |
| parent | cabcf6545b9e4adfb7d238a16a561e10b3c35ebc [diff] | |
| parent | 24244c443109f5cb4ea02a4ef406e01fcb590453 [diff] |
am 24244c44: am a8232452: Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev * commit '24244c443109f5cb4ea02a4ef406e01fcb590453': Fix Android Keystore key gen for keys requiring user auth.