Commit bb3214f8 authored by Neil Fuller's avatar Neil Fuller Committed by Android Git Automerger
Browse files

am 2164d895: (-s ours) resolved conflicts for merge of 865c83f8 to jb-mr2-dev-plus-aosp 

* commit '2164d895':
  Add support for TLS_FALLBACK_SCSV
parents 6c9609af 2164d895
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment