base

am 2bc48186: 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 '2bc481861ab374f87c12b7bb816ff75ac46147f1' into gingerbread-plus-aosp

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