diff options
| author | Andreas Huber <andih@google.com> | 2010-10-19 11:19:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 11:19:55 -0700 |
| commit | d842f5be71c565413a9d147f2f8ecfca8b2d01e4 (patch) | |
| tree | 4afc4ae360009933b125f1c83294af7beb4e2049 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b97d1ad03d710f2f089d73ed4d24e42414fca6ed (diff) | |
| parent | 15fc430e9aa6517a14160a5651a785c662a25885 (diff) | |
am 2d00c605: am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread
Merge commit '2d00c6050977f3e03665fbfef93f4f6aed041a63'
* commit '2d00c6050977f3e03665fbfef93f4f6aed041a63':
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