OSDN Git Service

am 39e876ad: (-s ours) Merge "When filling the cache, we always time out waiting...
authorJames Dong <jdong@google.com>
Fri, 18 Jun 2010 01:43:10 +0000 (18:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Jun 2010 01:43:10 +0000 (18:43 -0700)
commitae80ffa8ae70eb92196c435ea125b94e16758496
tree9d52c784ebd68acfc44a2cdb06d7cf057bba2c91
parentf4a4ec2063dfd28e04bbfe712f67acee4bdc8e37
parent748ad2b542867dab9d8e9f3c6fdf671fd803baad
am 39e876ad: (-s ours) 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 gingerbread

* commit '39e876ad743f203fe005333947c61383772b0d14':
  When filling the cache, we always time out waiting for a condition that won't occur.