| commit | b9c8b1e8140646915c00cd63dbe36e03c6005a76 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Wed Aug 05 18:45:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 05 18:45:43 2015 +0000 |
| tree | 5c1b86e0e8fd24852a2ce88d30be9b83cdcbe15e | |
| parent | b42b46e3be9208dfcf2c84107d6aaf64dde5dc99 [diff] | |
| parent | a84fc26d15aed853ec69632ceb5999ae9431be28 [diff] |
am a84fc26d: am c1c9f15e: am 3a6966a3: am 8426987b: Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev automerge: 34d183b * commit 'a84fc26d15aed853ec69632ceb5999ae9431be28': Revert "Changes associated with an OkHttp bad proxy response fix"