tree 80bbcd556b1f2bb19cd10c6a0a7835bb5082862f
parent 6da3c4a69850b3c043c04ff2d88d9727b84f1db1
parent cef32f3bb2da07efc846cf5bcd7970a74a782657
author Alex Klyubin <klyubin@google.com> 1384457521 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384457521 -0800

am cef32f3b: Merge "SSLEngine: Test that server params are verified" into jb-dev

* commit 'cef32f3bb2da07efc846cf5bcd7970a74a782657':
  SSLEngine: Test that server params are verified