am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really...

author Justin Ho <justinho@google.com>

Mon, 23 Jan 2012 23:13:50 +0000 (15:13 -0800)

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

Mon, 23 Jan 2012 23:13:50 +0000 (15:13 -0800)
author Justin Ho <justinho@google.com>
Mon, 23 Jan 2012 23:13:50 +0000 (15:13 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 23 Jan 2012 23:13:50 +0000 (15:13 -0800)
diff --cc services/audioflinger/AudioFlinger.cpp
Simple merge
diff --cc services/audioflinger/AudioFlinger.h
Simple merge
author	Justin Ho <justinho@google.com>
	Mon, 23 Jan 2012 23:13:50 +0000 (15:13 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 23 Jan 2012 23:13:50 +0000 (15:13 -0800)
		1	2
services/audioflinger/AudioFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/audioflinger/AudioFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history