diff options
| author | Andreas Huber <andih@google.com> | 2010-08-06 18:54:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-06 18:54:26 -0700 |
| commit | 2e7237c51f098fc1874844f2002c23e3cd06b65d (patch) | |
| tree | 509b165a9c92abd77498666313483d9216648e5b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d7fe288c9be449acc463fb769c12788741e37afa (diff) | |
| parent | ce4a755725672646f3020fbc52431798024fbcd5 (diff) | |
am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread
Merge commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba' into gingerbread-plus-aosp
* commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba':
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