summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2010-09-29 12:17:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-29 12:17:24 -0700
commit6acfce816db5fac8b2b5ed6dfa17002c8f1af851 (patch)
tree98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp
parentb5327a4ac088590eeb7a45dcf573d31e1b38deb2 (diff)
parent2a7aea9d7ef218d4d5f9f5540110943ae6873c12 (diff)
am 955ab37c: Merge "RTP: Enable GSM-EFR codec." into gingerbread
Merge commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c' into gingerbread-plus-aosp * commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c': RTP: Enable GSM-EFR codec.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions