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

am bebe6fa7: Merge "Revert "Revert "Changes associated with an OkHttp bad... 

am bebe6fa7: Merge "Revert "Revert "Changes associated with an OkHttp bad proxy response fix""" into lollipop-mr1-cts-dev

* commit 'bebe6fa7':
  Revert "Revert "Changes associated with an OkHttp bad proxy response fix""
parents 3a6966a3 bebe6fa7
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