summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-06-17 12:23:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-17 12:23:48 -0700
commit73d1a539e7166aa438c6267eb59f2e677c6a2e9e (patch)
treeaeb38e192659057f2b43059de62140ebd002d5df
parent25b5fc3cdfe5c52dda738e5019157466a51b1d27 (diff)
parent748ad2b542867dab9d8e9f3c6fdf671fd803baad (diff)
downloadframeworks_native-73d1a539e7166aa438c6267eb59f2e677c6a2e9e.zip
frameworks_native-73d1a539e7166aa438c6267eb59f2e677c6a2e9e.tar.gz
frameworks_native-73d1a539e7166aa438c6267eb59f2e677c6a2e9e.tar.bz2
am 39e876ad: Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
Merge commit '39e876ad743f203fe005333947c61383772b0d14' into froyo-plus-aosp * commit '39e876ad743f203fe005333947c61383772b0d14': When filling the cache, we always time out waiting for a condition that won't occur.
0 files changed, 0 insertions, 0 deletions