summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-07-20 09:33:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-20 09:33:09 -0700
commit88607d56ae30676e89d39bf3411d103643ee46d9 (patch)
tree06bbd40083a1bfe3694b0ba46f58f71878d9c2b4 /opengl/tests/gl_basic/gl_basic.cpp
parent0e26b504ecc2f6365bd14498073c467e0121f0b1 (diff)
parent4a2f4622f94a25faa42ea322f362c008d11c6cbf (diff)
am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
Merge commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f' * commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f': 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