diff options
| author | Andreas Huber <andih@google.com> | 2010-10-19 10:08:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 10:08:32 -0700 |
| commit | 15fc430e9aa6517a14160a5651a785c662a25885 (patch) | |
| tree | ccc2e69bb92259cb595ebc0359809599dcc39cbe /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 076f48745409a7239bb66aba66ca5eef16ca4a9b (diff) | |
| parent | 7961f288be2788d421d021b8535b1952105ae296 (diff) | |
am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread
Merge commit '52bea277ff92a2a1780e035c82c72082434e7b16' into gingerbread-plus-aosp
* commit '52bea277ff92a2a1780e035c82c72082434e7b16':
If we encounter video stream EOS while seeking we may still need to seek audio.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions