tree fa4385c9d0e22a7ed290007be32d065768807e20
parent 96c2ae2de5f51efd73b7ed8ecefa6cc23e7b1369
parent ff23ada45194221b1ab85e83e846977927ea83c0
author Neil Fuller <nfuller@google.com> 1439389617 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439389617 +0000

am ff23ada4: am 04ebb4d1: am b60e2bef: (-s ours) am 99189120: Merge "Revert "Revert "Add further handling for when a CONNECT incorrectly returns a body.""" into lollipop-mr1-cts-dev

* commit 'ff23ada45194221b1ab85e83e846977927ea83c0':
  Revert "Revert "Add further handling for when a CONNECT incorrectly returns a body.""