commit | ef62495739f8de2361920e7491e2b94cb689ab88 | [log] [tgz] |
---|---|---|
author | Adam Langley <agl@google.com> | Mon Jun 15 23:21:26 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 15 23:21:26 2015 +0000 |
tree | 628396a74d34d7b719b81d76410e7801111b6d40 | |
parent | d72b315b336eb2aca006fc1c359fc1b65aea010d [diff] | |
parent | b658cb43ec69b22d030445139cbfa88249f6121e [diff] |
am b658cb43: am 0e6bb1c7: Add ECDHE-PSK-AES{128,256}-SHA cipher suites. * commit 'b658cb43ec69b22d030445139cbfa88249f6121e': Add ECDHE-PSK-AES{128,256}-SHA cipher suites.