tree d6f777c3a839b7a816782d46a50245854e5f2330
parent e30b5b55806b31d1a61e2885b854dd7b8da1a07a
parent 00efe680b4cc6e9849cb270058ac5967af92ffef
author Elliott Hughes <enh@google.com> 1305563495 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305563495 -0700

am 00efe680: Merge "Make Apache HttpClient play nice with large kernel socket buffers."

* commit '00efe680b4cc6e9849cb270058ac5967af92ffef':
  Make Apache HttpClient play nice with large kernel socket buffers.