| commit | 809c1a68128f6ad97951be6525205488fc4f1d4e | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Aug 07 10:14:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 10:14:41 2015 +0000 |
| tree | 0614dfdd0d5b2e53e6b963d47eb34e710095f2ca | |
| parent | 7485d2ceef133bd12811308c57062593b65bbb02 [diff] | |
| parent | 236dcb7781bbacb52f9a0834198ca99379c87a84 [diff] |
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 '236dcb7781bbacb52f9a0834198ca99379c87a84': Revert "Revert "Changes associated with an OkHttp bad proxy response fix""