base

am eaeec4b7: 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 'eaeec4b718a31595a4d50d01b917d7eb7b1376ab'

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