Commit 0ec240e0 authored by Unsuk Jung's avatar Unsuk Jung Committed by Android Git Automerger
Browse files

am 4accf026: am bb73b4f6: am e928c2c5: (-s ours) Merge "DO NOT MERGE: CTS test... 

am 4accf026: am bb73b4f6: am e928c2c5: (-s ours) Merge "DO NOT MERGE: CTS test for OpenSSL\'s early CCS issue (CVE-2014-0224)" into jb-dev

* commit '4accf026':
  DO NOT MERGE: CTS test for OpenSSL's early CCS issue (CVE-2014-0224)
parents 4fff398d 4accf026
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment