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

am c8e1b9c1: resolved conflicts for merge of bfeba0c4 to jb-mr2-dev-plus-aosp 

* commit 'c8e1b9c1':
  Fix for TLS HTTP connections with GMS sockets
parents 18c077b3 c8e1b9c1
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