summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-03-31 11:44:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-03-31 11:44:01 -0700
commit72439952fb7f2c27179b78575b5a434ddcf8dba1 (patch)
tree8652850ea1b71670da1d7dd4420a16676827c007 /opengl/tests/gl_basic/gl_basic.cpp
parent9ef810bce8687394b31e94e3670990664504154a (diff)
parentdee5c122f5a22589d5921e42ad68928a4f8552f4 (diff)
am 41e8e4a2: am 804878f3: Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo
Merge commit '41e8e4a29df084e2e82fe13123d603b26a9eaefb' into kraken * commit '41e8e4a29df084e2e82fe13123d603b26a9eaefb': Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions