tree 3e8036136adde4c420932270bc17c99b1263a53d
parent 3a6966a3b9ed3152fe8a684b63c38a432b5cdfd3
parent bebe6fa75dcc0198fbd2a10f1e147e0f62989745
author Neil Fuller <nfuller@google.com> 1438882428 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438882428 +0000

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

* commit 'bebe6fa75dcc0198fbd2a10f1e147e0f62989745':
  Revert "Revert "Changes associated with an OkHttp bad proxy response fix""