summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/FastMixer.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2012-11-29 11:35:12 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-29 11:35:12 -0800
commitc67d057596d81aea8fcd4868453cfcb501157297 (patch)
tree025085be6fcc4ead1be6f033b114d5f8f3f2dde9 /services/audioflinger/FastMixer.cpp
parent504dd3fdad2e1f59eb553ea2d4f94235eb7a8472 (diff)
parentce8dcdf5361dd5de8c86cf5b0308c71d519f98ca (diff)
downloadframeworks_av-c67d057596d81aea8fcd4868453cfcb501157297.zip
frameworks_av-c67d057596d81aea8fcd4868453cfcb501157297.tar.gz
frameworks_av-c67d057596d81aea8fcd4868453cfcb501157297.tar.bz2
am ce8dcdf5: am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."
* commit 'ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca': Bug fix for the MediaPlayer::prepare() api.
Diffstat (limited to 'services/audioflinger/FastMixer.cpp')
0 files changed, 0 insertions, 0 deletions