summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2014-10-09 14:44:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-09 14:44:48 +0000
commit15ff3071031c18afbfada8df6c852f7747ccf16a (patch)
tree4e70eebc241ad3cb98ba164032d066b546e9da0e
parent593a2e1667f8923dff875268169bb5dfa4c67bef (diff)
parent8b188b864302f5ea9df17636b378938a15b4605a (diff)
downloadlibcore-15ff3071031c18afbfada8df6c852f7747ccf16a.zip
libcore-15ff3071031c18afbfada8df6c852f7747ccf16a.tar.gz
libcore-15ff3071031c18afbfada8df6c852f7747ccf16a.tar.bz2
am 8b188b86: (-s ours) resolved conflicts for merge of 6c9609af to klp-modular-dev
* commit '8b188b864302f5ea9df17636b378938a15b4605a': Add support for TLS_FALLBACK_SCSV
0 files changed, 0 insertions, 0 deletions