| commit | ecdd89b848b716110df99b556a7cea58b17d4ee7 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Tue Sep 01 09:55:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 09:55:22 2015 +0000 |
| tree | 36068939f978f3081095b62b5d4ba0257facf0c1 | |
| parent | 2b4d636ee34b64923361e7c0ad3a50ed37f8126d [diff] | |
| parent | b472314acb543ad31bdaad26c58b64f25f393038 [diff] |
am b472314a: am 34d183b4: Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev * commit 'b472314acb543ad31bdaad26c58b64f25f393038': Revert "Changes associated with an OkHttp bad proxy response fix"