tree a39ac500a7fc6ca3f6e1ae0d4e7c279edb8812c7
parent 3019fd32394a00d61bc05ce4e7cb3c949f6143ee
parent e0affcdc8c4513d91352c0fc6f4c5c29b0605d2d
author Alex Klyubin <klyubin@google.com> 1403189937 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403189937 +0000

am e0affcdc: Merge "Assert the updated list of supported ECDHE-PSK cipher suites."

* commit 'e0affcdc8c4513d91352c0fc6f4c5c29b0605d2d':
  Assert the updated list of supported ECDHE-PSK cipher suites.