| commit | c37d44a8e65350849b903be4a0dcfab490187c10 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Mon Jun 15 23:10:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 15 23:10:53 2015 +0000 |
| tree | 51737f32707a09b357fabb064d1e3989164abc8f | |
| parent | 8f2142f6a45166c02c2c99b31dd588ea4f760941 [diff] | |
| parent | 628c6de7e0560ecb081743a36612ff529d84a26b [diff] |
am 628c6de7: am 24244c44: am a8232452: Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev * commit '628c6de7e0560ecb081743a36612ff529d84a26b': Fix Android Keystore key gen for keys requiring user auth.