diff options
| author | James Dong <jdong@google.com> | 2010-07-28 12:00:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 12:00:58 -0700 |
| commit | ea3895567057f484a002aadade805fd0108b7357 (patch) | |
| tree | a49d05563de9b9b0a162a3c2f50f003ff4430168 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | eaa8fbd0bd71527c10d7594a4afaa1fa33e7a2ed (diff) | |
| parent | 41af3d253e0d3ce67aa41432504ab9dea06da66f (diff) | |
am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread
Merge commit '5587bb7e375c17c1320918e6f473625af1f5e5ac' into gingerbread-plus-aosp
* commit '5587bb7e375c17c1320918e6f473625af1f5e5ac':
Interleave the audio and video by default
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions