summaryrefslogtreecommitdiffstats
path: root/graphics/jni/android_renderscript_RenderScript.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-04-12 17:28:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-12 17:28:48 -0700
commit275e0662c1fb96d5b0ceeb9b84e2db239b29ea27 (patch)
treea440c203e4270f8e55c5d3ed8a962a6164ec93f2 /graphics/jni/android_renderscript_RenderScript.cpp
parent134a67c838a211edcb92311721dda38637c3d51e (diff)
parent63642b1202aebe27a8b19b8458b68b4d5339c978 (diff)
downloadframeworks_base-275e0662c1fb96d5b0ceeb9b84e2db239b29ea27.zip
frameworks_base-275e0662c1fb96d5b0ceeb9b84e2db239b29ea27.tar.gz
frameworks_base-275e0662c1fb96d5b0ceeb9b84e2db239b29ea27.tar.bz2
am 63642b12: am 7853c898: am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
Diffstat (limited to 'graphics/jni/android_renderscript_RenderScript.cpp')
0 files changed, 0 insertions, 0 deletions