| commit | e59868addb46e1eb7593200ad6424d504ade916b | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <[email protected]> | Thu Jun 19 15:03:20 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Thu Jun 19 15:03:20 2014 +0000 |
| tree | e4c7b633afb22048b784b527ce79a8bfa19a9392 | |
| parent | 76459f601a183eb68ec49008b204a2cb98699efc [diff] | |
| parent | 4c0ba1cf6b8c87230c287c305314e3eee574ff0c [diff] |
am 4c0ba1cf: am f5c5da4e: Merge "Replace ECDHE-PSK SHA-2 cipher suites with SHA-1 ones." * commit '4c0ba1cf6b8c87230c287c305314e3eee574ff0c': Replace ECDHE-PSK SHA-2 cipher suites with SHA-1 ones.