summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2010-09-28 19:43:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-28 19:43:50 -0700
commit90d2e41eef7d57be8864faaa48af54b68ca24107 (patch)
tree98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp
parent7812878c68a3e3de35b0212853847c219171643d (diff)
parente708b34802490de7b5aa5bfe0dae24e1f67739f3 (diff)
am e006e4d2: Merge changes Iae1913fb,I38dbefef into gingerbread
Merge commit 'e006e4d2c91c50795df0a02366b31610b4e97cb1' into gingerbread-plus-aosp * commit 'e006e4d2c91c50795df0a02366b31610b4e97cb1': RTP: Enable GSM codec. RTP: Refactor out G711 codecs into another file.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions