diff options
| author | James Dong <jdong@google.com> | 2010-07-28 12:02:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 12:02:59 -0700 |
| commit | 5e8416b3d182d1173fb5a14ca2ce690cc645d799 (patch) | |
| tree | 7b84d84a9d2b56a07f17e822fd4f78faeebd839a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c3b6dea724009040bd377cd83108a557c7c99119 (diff) | |
| parent | ea3895567057f484a002aadade805fd0108b7357 (diff) | |
am cb51115c: am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread
Merge commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b'
* commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b':
Interleave the audio and video by default
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions