diff options
| author | Andreas Huber <andih@google.com> | 2010-03-31 11:38:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-31 11:38:54 -0700 |
| commit | dee5c122f5a22589d5921e42ad68928a4f8552f4 (patch) | |
| tree | 3552620b2a0ba895bf41b4587f5199ab7df863b6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4b0a8055b86b96b1658970cac1ddfad595882e94 (diff) | |
| parent | 54de5d19bcdf0addf19fe55599bb5b3835e85690 (diff) | |
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 '804878f3a3ea40ace5bd572cee98f9e13a0dbf0b' into froyo-plus-aosp
* commit '804878f3a3ea40ace5bd572cee98f9e13a0dbf0b':
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