| commit | 4c0ba1cf6b8c87230c287c305314e3eee574ff0c | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <[email protected]> | Thu Jun 19 14:58:56 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Thu Jun 19 14:58:56 2014 +0000 |
| tree | 9f5e5fe7e155bc2cdb36070d871710ba5bb4df03 | |
| parent | a0fe4fd776377ada3ff2be828159ec897065d2a8 [diff] | |
| parent | f5c5da4ec5b254dca1df338696e8e542c0dd005f [diff] |
am f5c5da4e: Merge "Replace ECDHE-PSK SHA-2 cipher suites with SHA-1 ones." * commit 'f5c5da4ec5b254dca1df338696e8e542c0dd005f': Replace ECDHE-PSK SHA-2 cipher suites with SHA-1 ones.