Commit 284aa4a7 authored by Unsuk Jung's avatar Unsuk Jung Committed by Android Git Automerger
Browse files

am 0e1d6a4d: am d8c6c555: am d64baba4: am e045f01e: (-s ours) am 75501b5b: am...

am 0e1d6a4d: am d8c6c555: am d64baba4: am e045f01e: (-s ours) am 75501b5b: am 0ced4198: (-s ours) am 8b41457d: am db201b53: am 0ec240e0: am 4accf026: am bb73b4f6: am e928c2c5: (-s ours) Merge "DO NOT MERGE: CTS test for OpenSSL\'s early CCS issue (CVE-2014-0224)" into

* commit '0e1d6a4d':
  DO NOT MERGE: CTS test for OpenSSL's early CCS issue (CVE-2014-0224)
parents 6a10ba7f 0e1d6a4d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment