commit | e40c0333c6c4f7b618f5160bad5cd55aef0ea521 | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Thu Jun 17 18:55:13 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 17 18:55:13 2010 -0700 |
tree | 89620aa9cc59285ac800f24d07efb938a66677d0 | |
parent | 206ebe295b0b900b58c760e4df6b5d2c8ad4d4f8 [diff] | |
parent | e6de2667d6bf4bb7b926da6784cc7eb886b93e83 [diff] |
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.