diff options
| author | Andreas Huber <andih@google.com> | 2011-03-16 13:41:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-16 13:41:28 -0700 |
| commit | e660bd1b765f0577b60503b7e1bd30df3931cce2 (patch) | |
| tree | 6a9b74c907663c54867aa574ca1bfaa17cd57594 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 102da9211378aa1368063f3c977fc1248b6e0c1b (diff) | |
| parent | 5360b59d75ee0e48f83a2a9e584485ae48689e3a (diff) | |
am 1a47fc35: (-s ours) am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
* commit '1a47fc353157bf9798c8a7425f106681e14bf4a5':
DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions