summaryrefslogtreecommitdiff
path: root/libs/rs/rsScriptC.cpp
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2010-07-20 09:33:09 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-20 09:33:09 -0700
commit3f15301c06f968c8f1bb8fc88e1c090ab3824bb5 (patch)
treefcf0b02ba3465d2bfc460bb9727b84cf1e1217af /libs/rs/rsScriptC.cpp
parent30881f68c97125f6bc1dbc7c26ccb3cdb91ebd2a (diff)
parent4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f (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 'libs/rs/rsScriptC.cpp')
0 files changed, 0 insertions, 0 deletions