diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-10 14:45:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-10 14:45:37 +0000 |
| commit | 70b3b1c02e792f67fedcd5ce5c58e85c448c8f67 (patch) | |
| tree | 4e70eebc241ad3cb98ba164032d066b546e9da0e | |
| parent | b390fcdad513ae47cd3c801402846b2dd862b103 (diff) | |
| parent | 39d896a3dad05a8101b10a675e6e056c717e36c3 (diff) | |
| download | libcore-70b3b1c02e792f67fedcd5ce5c58e85c448c8f67.zip libcore-70b3b1c02e792f67fedcd5ce5c58e85c448c8f67.tar.gz libcore-70b3b1c02e792f67fedcd5ce5c58e85c448c8f67.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
0 files changed, 0 insertions, 0 deletions