diff options
| author | James Dong <jdong@google.com> | 2010-06-17 18:43:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-17 18:43:10 -0700 |
| commit | 2bc481861ab374f87c12b7bb816ff75ac46147f1 (patch) | |
| tree | fb67ed204c6d9567957875aad9c0934f42673f02 /opengl/java/android/opengl/Texture.java | |
| parent | e899caf8cce1d1a20121f19a99899553ae2b327e (diff) | |
| parent | 39e876ad743f203fe005333947c61383772b0d14 (diff) | |
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.
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions