Skip to content
Commit 75b7f959 authored by Neil Fuller's avatar Neil Fuller Committed by Android Git Automerger
Browse files

am 2b5a3d1f: am 0f2dac0f: resolved conflicts for merge of 69c63910 to jb-mr2-dev-plus-aosp 

* commit '2b5a3d1f':
  Add support for TLS_FALLBACK_SCSV
parents aad21bb5 2b5a3d1f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment