tree ecf049c0e56fdf2b7d414b2fcafa8b190b65e2cd
parent 1f76c1381df635b46e93b4a592b1024a4418be24
parent 4bae3aba0494da7c4e3c1b28ff978eb38e6323e6
author Adam Langley <agl@google.com> 1434409316 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434409316 +0000

am 4bae3aba: Drop ECDHE-PSK-AES-128-GCM.

* commit '4bae3aba0494da7c4e3c1b28ff978eb38e6323e6':
  Drop ECDHE-PSK-AES-128-GCM.