| commit | e045f01ee20987f301102cc7c349d9c565e84979 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Fri Jun 27 10:33:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 27 10:33:45 2014 +0000 |
| tree | 955c8e6b2f822cdee33280f802ae3e2a848302a5 | |
| parent | ef6f8102cf07f07049e925384e35dcc2bc2bf1f6 [diff] | |
| parent | 75501b5b1d1dcd0a52b9f7a8191737a289bed079 [diff] |
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 '75501b5b1d1dcd0a52b9f7a8191737a289bed079': DO NOT MERGE: CTS test for OpenSSL's early CCS issue (CVE-2014-0224)