| commit | ff23ada45194221b1ab85e83e846977927ea83c0 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Wed Aug 12 14:21:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 14:21:49 2015 +0000 |
| tree | 76a8b9e04f451a52bc44f9522efb8352c81a0085 | |
| parent | 79969219116d54160c40680b11071f033cf319b3 [diff] | |
| parent | 04ebb4d15a32fe00523e1bb7c711a26446b52788 [diff] |
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 '04ebb4d15a32fe00523e1bb7c711a26446b52788': Revert "Revert "Add further handling for when a CONNECT incorrectly returns a body.""