tree cf6b0abccb56ce7c2e1324c12f9e27e70c35d49d
parent 6e8291186b056301ecb1ce0d17bc116fd77ad769
parent 99189120cb4444cc196251961234ed8642534644
author Neil Fuller <nfuller@google.com> 1439373778 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439373778 +0000

am 99189120: Merge "Revert "Revert "Add further handling for when a CONNECT incorrectly returns a body.""" into lollipop-mr1-cts-dev

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