tree a2f7f2481dd74b382287e640ab9691e76c4508c7
parent bc704dddb6d1239c55f6cd0f93d349f7cc3d1219
parent 357f8209f3aec63fa2779da4eeab8825f80b0a41
author Andreas Huber <andih@google.com> 1277489130 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277489130 -0700

am 357f8209: Merge "Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread

Merge commit '357f8209f3aec63fa2779da4eeab8825f80b0a41' into gingerbread-plus-aosp

* commit '357f8209f3aec63fa2779da4eeab8825f80b0a41':
  Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers