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