summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Extractor.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-01-30 13:38:52 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-30 13:38:52 -0800
commite59542680aa0e83cacbc471fbd3945b0509a849c (patch)
tree1f700612e12023ffbd774406f064d5da9c2ca8e2 /media/libstagefright/MPEG4Extractor.cpp
parente9c52da6fdb755ed832325c2fe4fe5b3bc4c9eed (diff)
parentc58295bfa07615b81b9bf5784cb8e2dac79aded7 (diff)
downloadframeworks_av-e59542680aa0e83cacbc471fbd3945b0509a849c.zip
frameworks_av-e59542680aa0e83cacbc471fbd3945b0509a849c.tar.gz
frameworks_av-e59542680aa0e83cacbc471fbd3945b0509a849c.tar.bz2
am 827a597d: Reconcile with ics-mr1-release
* commit '827a597df70a51c6cccad52fae2be2c469f58b77': Revert "Fix 5797764: Increase lock screen's thread priority" DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
0 files changed, 0 insertions, 0 deletions