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