diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-10 15:17:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-10 15:17:36 +0000 |
| commit | 73f5c01dd40d1823cb86cb329a38dd8b620d20cb (patch) | |
| tree | d157e585116025b112dd2c702ab0a63126b2de80 /xml/src | |
| parent | 111b7477309f0d8fcad70c3a06154b9faf57c273 (diff) | |
| parent | 70b3b1c02e792f67fedcd5ce5c58e85c448c8f67 (diff) | |
| download | libcore-73f5c01dd40d1823cb86cb329a38dd8b620d20cb.zip libcore-73f5c01dd40d1823cb86cb329a38dd8b620d20cb.tar.gz libcore-73f5c01dd40d1823cb86cb329a38dd8b620d20cb.tar.bz2 | |
am 70b3b1c0: am 39d896a3: am 73041ff9: am bb3214f8: am 2164d895: (-s ours) resolved conflicts for merge of 865c83f8 to jb-mr2-dev-plus-aosp
* commit '70b3b1c02e792f67fedcd5ce5c58e85c448c8f67':
Add support for TLS_FALLBACK_SCSV
Diffstat (limited to 'xml/src')
0 files changed, 0 insertions, 0 deletions