am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when...

author Eric Laurent <elaurent@google.com>

Tue, 24 Jan 2012 19:51:15 +0000 (11:51 -0800)

committer Android Git Automerger <android-git-automerger@android.com>

Tue, 24 Jan 2012 19:51:15 +0000 (11:51 -0800)
author Eric Laurent <elaurent@google.com>
Tue, 24 Jan 2012 19:51:15 +0000 (11:51 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 24 Jan 2012 19:51:15 +0000 (11:51 -0800)
diff --cc services/audioflinger/AudioFlinger.cpp
Simple merge
diff --cc services/audioflinger/AudioFlinger.h
Simple merge
author	Eric Laurent <elaurent@google.com>
	Tue, 24 Jan 2012 19:51:15 +0000 (11:51 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 24 Jan 2012 19:51:15 +0000 (11:51 -0800)
		1	2
services/audioflinger/AudioFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/audioflinger/AudioFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history