diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-10 14:35:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-10 14:35:25 +0000 |
| commit | 23cf3839398f809c9631a26b5fc754502b8c63e6 (patch) | |
| tree | b45f498d7c191dd20998992ec413302c002bd3ea /support | |
| parent | fcc19aa354bd202f1c7064b8ceb5e56f30c12162 (diff) | |
| parent | 39d896a3dad05a8101b10a675e6e056c717e36c3 (diff) | |
| download | libcore-23cf3839398f809c9631a26b5fc754502b8c63e6.zip libcore-23cf3839398f809c9631a26b5fc754502b8c63e6.tar.gz libcore-23cf3839398f809c9631a26b5fc754502b8c63e6.tar.bz2 | |
am 39d896a3: am 73041ff9: am bb3214f8: am 2164d895: (-s ours) resolved conflicts for merge of 865c83f8 to jb-mr2-dev-plus-aosp
* commit '39d896a3dad05a8101b10a675e6e056c717e36c3':
Add support for TLS_FALLBACK_SCSV
Diffstat (limited to 'support')
0 files changed, 0 insertions, 0 deletions