| commit | c51bba09dff12cfffc9c5a30b83a2b5f9fd745e4 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Jul 15 15:53:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 15 15:53:45 2014 +0000 |
| tree | df0d2e3f54fc3fc5f9dc2ec43da0eb3227a32600 | |
| parent | 7963eff89ef3600db4f8c936563a885fa4ef2b23 [diff] | |
| parent | ea43fa1424058748e3ec4ac01d2f6e1898e9a4e3 [diff] |
am ea43fa14: Merge "TLS-PSK cipher suites enabled when PSKKeyManager is provided." * commit 'ea43fa1424058748e3ec4ac01d2f6e1898e9a4e3': TLS-PSK cipher suites enabled when PSKKeyManager is provided.