commit 193985ffd553c139e8c1094d7798edbe5b0797c5
author Andreas Huber <andih@google.com> Tue Aug 10 11:45:01 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 10 11:45:01 2010 -0700
tree 5eeb77e957bd4199d789e08953a0ad2e3b056d3d
parent a04883412ec1a5dac3e83c3fd3c335ab9579a990
parent 235be391f3b9cd79e525de87757e361ae044940d

am 235be391: Merge "Many, many developers misread or don\'t read the http specs and terminate lines with \'\n\' instead of CRLF \'\r\n\' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread

Merge commit '235be391f3b9cd79e525de87757e361ae044940d' into gingerbread-plus-aosp

* commit '235be391f3b9cd79e525de87757e361ae044940d':
  Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.