| commit | 51c1e6258990221561edc280a9cc92f517ee58fa | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Mon Mar 24 17:27:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 24 17:27:20 2014 +0000 |
| tree | 11057c56cc9a33a3a07759e334782120caa28b9a | |
| parent | 9423541f9db6aa91e2db8b30c1657f2d21526bba [diff] | |
| parent | ec9d9093bb67dfb004d9d96bf418e92a240b7102 [diff] |
am ec9d9093: am b335c684: Merge "Support multiple KeyManagers in TestSSLContext and TestKeyStore." * commit 'ec9d9093bb67dfb004d9d96bf418e92a240b7102': Support multiple KeyManagers in TestSSLContext and TestKeyStore.