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