| commit | cd07c28b3c4178600bf38a55e9f4535d9034c6f9 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Thu Aug 06 17:37:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 17:37:38 2015 +0000 |
| tree | 3e8036136adde4c420932270bc17c99b1263a53d | |
| parent | c1c9f15edfbc1f86b679c90f963e9eb852ad9c53 [diff] | |
| parent | 8fd977f68fcf889c994fc2d3811d2452e63795ff [diff] |
am 8fd977f6: am bebe6fa7: Merge "Revert "Revert "Changes associated with an OkHttp bad proxy response fix""" into lollipop-mr1-cts-dev * commit '8fd977f68fcf889c994fc2d3811d2452e63795ff': Revert "Revert "Changes associated with an OkHttp bad proxy response fix""