diff options
| author | James Dong <jdong@google.com> | 2010-10-21 20:18:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 20:18:16 -0700 |
| commit | 2418a4974f2a9d7ad55c2460f2c20c36e44c4c65 (patch) | |
| tree | 16d550976076f0294750952e0cc42d55b9a64ea4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5dcaf70eb3cd0dc857c3f466dc537d7307b8ea62 (diff) | |
| parent | 33c44f267aa8482863a222b2e8b7fc98edd43416 (diff) | |
am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread
Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp
* commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410':
Turn the media time adjustment in file writer back on
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions