diff options
| author | Andreas Huber <andih@google.com> | 2010-07-20 09:24:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-20 09:24:53 -0700 |
| commit | 4a2f4622f94a25faa42ea322f362c008d11c6cbf (patch) | |
| tree | 0c919194c090714877b2c62e25984e00b216d760 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 26dad2292021b414b7916b9d511b1468d2ee8912 (diff) | |
| parent | c49422fba45656ef1c3c78b64e7507cb66eaf4a0 (diff) | |
am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
Merge commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc' into gingerbread-plus-aosp
* commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc':
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions