tree b6fcb37b457db465ae13cf873f2d74732a06effb
parent 314c1f4630cc07691658aa2b0c7c71899b4a1eef
parent 11708986502da018afec813a9fd395b94003f160
author Alex Klyubin <klyubin@google.com> 1384459290 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384459290 -0800

am 11708986: am b00f46fc: am 23b3ea3a: am e496d90d: am cef32f3b: Merge "SSLEngine: Test that server params are verified" into jb-dev

* commit '11708986502da018afec813a9fd395b94003f160':
  SSLEngine: Test that server params are verified