summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-04-13 12:20:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-13 12:20:09 -0700
commit5cfe7910a387a4976290d91bd6ea0408984a9431 (patch)
tree3e5f86120f1ff365c1753580da989ae35d07c503 /opengl/tests/gl_basic/gl_basic.cpp
parent263f52f58e32d691d0c8057ef7376ece085f50df (diff)
parentdaeec8c5b335ba84aa932a80e6319be5d71f1956 (diff)
am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." into froyo
Merge commit 'db281311a0e957ba989509cf11f2085b4db12074' into froyo-plus-aosp * commit 'db281311a0e957ba989509cf11f2085b4db12074': Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions