tree 0960d0b19517382adce83d25cf6694e40cf9ae05
parent 235073a549ec664caea93e0ccded95e4a6819b6b
parent ef1c48d6a976f56bf7f7a41a5b2e8725af988362
author Andreas Huber <andih@google.com> 1277226752 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277226752 -0700

am ef1c48d6: Merge "Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not." into gingerbread

Merge commit 'ef1c48d6a976f56bf7f7a41a5b2e8725af988362' into gingerbread-plus-aosp

* commit 'ef1c48d6a976f56bf7f7a41a5b2e8725af988362':
  Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not.