summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/ACodec.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-01-29 17:57:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-29 17:57:49 +0000
commitadf3f9b98b482180fc1d0835c1b6212b1659e249 (patch)
treeefa63ec9de948a5c4e71e99a975551bfd139c420 /media/libstagefright/ACodec.cpp
parent2abfe880ced297e2b3ddd5f06d9abfd3742cb855 (diff)
parentd2dc66a223b611142da8a019ebde79e3f8dc18f5 (diff)
downloadframeworks_av-adf3f9b98b482180fc1d0835c1b6212b1659e249.zip
frameworks_av-adf3f9b98b482180fc1d0835c1b6212b1659e249.tar.gz
frameworks_av-adf3f9b98b482180fc1d0835c1b6212b1659e249.tar.bz2
am d2dc66a2: am 1bf0eecd: Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"
* commit 'd2dc66a223b611142da8a019ebde79e3f8dc18f5': AudioMixer: Remove tracks from enabledTracks after reseting outTemp
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
0 files changed, 0 insertions, 0 deletions