| commit | 4accf02697ab1284075e556c0d06dd5c692baaf0 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Fri Jun 27 09:57:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 27 09:57:29 2014 +0000 |
| tree | ce4193bea35825698f9a3f02752e50008716d84f | |
| parent | 912d15067f598cff726c69fbbb24695dbed55034 [diff] | |
| parent | bb73b4f62ab436a0d34e3b366b9182129336b54e [diff] |
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 'bb73b4f62ab436a0d34e3b366b9182129336b54e': DO NOT MERGE: CTS test for OpenSSL's early CCS issue (CVE-2014-0224)