summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-12-22 12:38:11 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-22 12:38:11 -0800
commit7bc0c0a8b7d1e6276bc065d942cdfbd2e1b762a2 (patch)
treef0dd2b8739c73a8978d14aefece24c5b5ce4cefc /opengl/tests/gl_basic/gl_basic.cpp
parent6777b7fea3de71de095b710b756ace15df595733 (diff)
Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions