summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-09-23 10:17:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-23 10:17:30 -0700
commit535b68553e077be8e142f3a6cefc79cfcfd974cd (patch)
treeb384ee75405465b41a55c0fb82ddf0b3f16b7dd1 /opengl/tests/gl_basic/gl_basic.cpp
parent36e39984cbc9f594feeaf5caad83a171d41864b8 (diff)
parentb3cc6a47f2a2b301ab668ed759beace17d7009f8 (diff)
am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread
Merge commit '697bd76e427f00584a0e026ceca2f4d39215cd0d' into gingerbread-plus-aosp * commit '697bd76e427f00584a0e026ceca2f4d39215cd0d': Use the advertised profile and level from M4V and H263 video encoders
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions