commit ac4bbc2e181fb9505b38e2410ff9035dddfbab9b
author Andreas Huber <andih@google.com> Tue Aug 10 11:47:04 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 10 11:47:04 2010 -0700
tree 8ebf99b7cca754f6d7a0bb721e91bff675bbfe24
parent 926bd956d6d149c12ddfe92d55d4a1de705861ec
parent 193985ffd553c139e8c1094d7798edbe5b0797c5

am 193985ff: 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 ginger

Merge commit '193985ffd553c139e8c1094d7798edbe5b0797c5'

* commit '193985ffd553c139e8c1094d7798edbe5b0797c5':
  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.