| commit | 8e7c37f4cbf761d74c28a9b8175a3ead8d76858a | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Aug 07 10:24:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 10:24:19 2015 +0000 |
| tree | 952041664b34c8565da45fba1d34214aa9369fc6 | |
| parent | 40574561d805f5cd66d6052228f81d4968bb2808 [diff] | |
| parent | 809c1a68128f6ad97951be6525205488fc4f1d4e [diff] |
am 809c1a68: am 236dcb77: am cd07c28b: am 8fd977f6: am bebe6fa7: Merge "Revert "Revert "Changes associated with an OkHttp bad proxy response fix""" into lollipop-mr1-cts-dev * commit '809c1a68128f6ad97951be6525205488fc4f1d4e': Revert "Revert "Changes associated with an OkHttp bad proxy response fix""