am 39e876ad: (-s ours) Merge "When filling the cache, we always time out...

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 '39e876ad' into gingerbread

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