| commit | c1c9f15edfbc1f86b679c90f963e9eb852ad9c53 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Tue Aug 04 09:54:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 04 09:54:38 2015 +0000 |
| tree | be66077ab77eae8561eabffc0ba4c78c2b288739 | |
| parent | d7e7b6265a82c3cb859bd2e1d4c3c8eb1a80216b [diff] | |
| parent | 3a6966a3b9ed3152fe8a684b63c38a432b5cdfd3 [diff] |
am 3a6966a3: am 8426987b: Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev automerge: 34d183b * commit '3a6966a3b9ed3152fe8a684b63c38a432b5cdfd3': Revert "Changes associated with an OkHttp bad proxy response fix"