summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-05-10 09:49:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-10 09:49:24 -0700
commit17dff2accd2f40bb112cebf76eab7d05857e0625 (patch)
treeb013fbb9d1d2f493488ba7f3fcebca98f88110c1 /opengl/tests/gl_basic/gl_basic.cpp
parent0c7af77450f9bddb9b1c32971673458c9d486f55 (diff)
parent60610126006ace2ef539c09ec93f941bc1dffada (diff)
am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Merge commit '1707851090e6512a77247b0c260dd673ef687589' into kraken * commit '1707851090e6512a77247b0c260dd673ef687589': A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions