| commit | 9fb6d9e60a8d4bdcdc745eabc07103b16c8eeaac | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Nov 07 17:19:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 17:19:45 2014 +0000 |
| tree | c7086c4d10bf8297ba1990cc8b6c5ac3dbc7195d | |
| parent | 57a27c55fe9ab5c29068c5d06e578a87b851c994 [diff] | |
| parent | 717e4019c09b8a3ec8e1b158ec15bd28278745cf [diff] |
am 717e4019: Merge "Changes associated with an OkHttp bad proxy response fix" * commit '717e4019c09b8a3ec8e1b158ec15bd28278745cf': Changes associated with an OkHttp bad proxy response fix