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

am 2784ad7c: am d0ba0110: am 9603baee: am 5bca0d94: am c8e1b9c1: resolved... 

am 2784ad7c: am d0ba0110: am 9603baee: am 5bca0d94: am c8e1b9c1: resolved conflicts for merge of bfeba0c4 to jb-mr2-dev-plus-aosp

* commit '2784ad7c':
  Fix for TLS HTTP connections with GMS sockets
parents 41739784 2784ad7c
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