Commit d8c6c555 authored Jun 27, 2014 by Unsuk Jung Committed by Android Git Automerger Jun 27, 2014

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

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 jb-dev

* commit 'd64baba4':
  DO NOT MERGE: CTS test for OpenSSL's early CCS issue (CVE-2014-0224)

parents 8b42ca86 d64baba4

Show whitespace changes

Inline Side-by-side

Please to comment