| commit | db201b534d93b692b7957abcf34906a1b4af8677 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Fri Jun 27 10:07:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 27 10:07:26 2014 +0000 |
| tree | c262074e62d173a2ae9e276bc49925f6b78f5c6a | |
| parent | 0bf0d41f85390d4a6ed31637c257920a932f15b8 [diff] | |
| parent | 0ec240e09a27a61ad389cacdbf2a0c46da18fe1c [diff] |
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 '0ec240e09a27a61ad389cacdbf2a0c46da18fe1c': DO NOT MERGE: CTS test for OpenSSL's early CCS issue (CVE-2014-0224)