summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2010-06-23 10:31:50 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-23 10:31:50 -0700
commit9b1c2a50d221d7fb69842e6dd4c86c2c11e73f5e (patch)
tree8eec87339700f0842499118dd5e2219243e0991f /libs/rs/rsScript.cpp
parentc450cd0db67efb6160c2f4c51b83768b445f5d19 (diff)
parent6adf0c4de62f0b13b84f18c6cda254a8dfeb2296 (diff)
am 6adf0c4d: 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 '6adf0c4de62f0b13b84f18c6cda254a8dfeb2296' * commit '6adf0c4de62f0b13b84f18c6cda254a8dfeb2296': Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not.
Diffstat (limited to 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions