diff options
| author | Andreas Huber <andih@google.com> | 2010-08-06 19:06:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-06 19:06:52 -0700 |
| commit | 92fc72f95c9f8df6b0b756840929c67f727bfa17 (patch) | |
| tree | e322e5740941cb092c1291b54ec648b4e1785eb3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 89fcd03e9498f4f869e377479b33cfbcbca1f011 (diff) | |
| parent | 2e7237c51f098fc1874844f2002c23e3cd06b65d (diff) | |
am 4f25d033: am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread
Merge commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55'
* commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55':
Properly skip the 'skip' chunk in mpeg4 files.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions