Merge "Rename mixBuffer to mMixerBuffer in FastMixer"

author Andy Hung <hunga@google.com>

Tue, 27 May 2014 22:29:46 +0000 (22:29 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 27 May 2014 22:29:46 +0000 (22:29 +0000)
author Andy Hung <hunga@google.com>
Tue, 27 May 2014 22:29:46 +0000 (22:29 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 27 May 2014 22:29:46 +0000 (22:29 +0000)
diff --cc services/audioflinger/FastMixer.cpp
Simple merge
diff --cc services/audioflinger/FastMixer.h
Simple merge
author	Andy Hung <hunga@google.com>
	Tue, 27 May 2014 22:29:46 +0000 (22:29 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 27 May 2014 22:29:46 +0000 (22:29 +0000)
		1	2
services/audioflinger/FastMixer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/audioflinger/FastMixer.h	patch \|	diff1 \|	diff2 \|	blob \| history