| commit | 236dcb7781bbacb52f9a0834198ca99379c87a84 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Thu Aug 06 21:13:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 21:13:00 2015 +0000 |
| tree | c157f6abf581c4e5dd8f62908603bfabdc044f35 | |
| parent | a84fc26d15aed853ec69632ceb5999ae9431be28 [diff] | |
| parent | cd07c28b3c4178600bf38a55e9f4535d9034c6f9 [diff] |
am cd07c28b: am 8fd977f6: am bebe6fa7: Merge "Revert "Revert "Changes associated with an OkHttp bad proxy response fix""" into lollipop-mr1-cts-dev * commit 'cd07c28b3c4178600bf38a55e9f4535d9034c6f9': Revert "Revert "Changes associated with an OkHttp bad proxy response fix""