summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDave Sparks <davidsparks@android.com>2010-04-01 09:51:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-01 09:51:42 -0700
commitf96f63d9ceb298ac3eb50eebd5f65e13761aaaff (patch)
treea02db8ec4f9529c70a90e48822c7a21f2ac18b25 /opengl/tests/gl_basic/gl_basic.cpp
parent09c5ec77964d8e9e477f497a030609d33249e11d (diff)
parentca08c653bbbd243a90558ae2dd3d37dafd038017 (diff)
am 5100df84: am 49e5a4c5: Update AMR codec.
Merge commit '5100df844c209b93b912917fad3e402e00241210' into kraken * commit '5100df844c209b93b912917fad3e402e00241210': Update AMR codec.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions