diff options
| author | Andreas Huber <andih@google.com> | 2010-04-07 11:05:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-07 11:05:56 -0700 |
| commit | dd61da6deb626e42b2985297e7c830b923646187 (patch) | |
| tree | ec1cb255bbdad108ce60ceb7267e305a4f0f34e6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1a5472e812b0530c721bb32cab3bc1214edec57f (diff) | |
| parent | ddb4ab191d5c25e5021d9069125a66759cf43e08 (diff) | |
am 01f78928: am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
Merge commit '01f78928228cd097bc6816ae03909a2b01d5c1d5' into kraken
* commit '01f78928228cd097bc6816ae03909a2b01d5c1d5':
Report the requested seek time while seek is in progress.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions