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

am d0ba0110: am 9603baee: am 5bca0d94: am c8e1b9c1: resolved conflicts for... 

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

* commit 'd0ba0110':
  Fix for TLS HTTP connections with GMS sockets
parents 5c1aebcf d0ba0110
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