diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-10 17:15:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-10 17:15:49 +0000 |
| commit | edc16da2164958ab31963754e10826ef532e5a23 (patch) | |
| tree | 441ca9a473b409bfe1c89324c0c08129160b0542 | |
| parent | f5144a90b35e49c8611eeb7b62b5170922e0bec9 (diff) | |
| parent | c9f5845a2a425e568812cb29d94652b5ee058394 (diff) | |
| download | openssl-edc16da2164958ab31963754e10826ef532e5a23.tar.gz | |
am c9f5845a: am 75b7f959: am 2b5a3d1f: am 0f2dac0f: resolved conflicts for merge of 69c63910 to jb-mr2-dev-plus-aosp
* commit 'c9f5845a2a425e568812cb29d94652b5ee058394':
Add support for TLS_FALLBACK_SCSV
0 files changed, 0 insertions, 0 deletions