diff options
| author | Andreas Huber <andih@google.com> | 2011-12-06 16:59:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-06 16:59:52 -0800 |
| commit | 29c5c4f5771bbec84fe14110299dad4ea5026ba0 (patch) | |
| tree | a4f7155e7d0e10895947a985fd9e447a72f9a5a0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 370a0ea3e79ba7eae9c0c00a6d9ca2e857eb178e (diff) | |
| parent | 7419051ce082d1bcd1f8d4e0a4c1d76cf98a86d2 (diff) | |
am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1
* commit '92860d5d4681e684d5f3936137c6c067c950121e':
DO NOT MERGE: Remove the AVI extractor.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions