tree a86fe83260daf6a8f4b16e2f3dd10532bf4e90a6
parent 1aeac900adba20ba6182589d71c2f8eed8eaf8eb
parent ce55fb3ffdad1ff97fdc9334204677f49c1b5550
author Neil Fuller <nfuller@google.com> 1438963649 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438963649 +0000

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

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