Merge "Update multichannel audio policy handling" into lmp-dev

author Andy Hung <hunga@google.com>

Tue, 29 Jul 2014 23:52:28 +0000 (23:52 +0000)

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

Tue, 29 Jul 2014 21:36:00 +0000 (21:36 +0000)
author Andy Hung <hunga@google.com>
Tue, 29 Jul 2014 23:52:28 +0000 (23:52 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 29 Jul 2014 21:36:00 +0000 (21:36 +0000)
diff --cc services/audiopolicy/AudioPolicyManager.cpp
Simple merge
diff --cc services/audiopolicy/AudioPolicyManager.h
Simple merge
author	Andy Hung <hunga@google.com>
	Tue, 29 Jul 2014 23:52:28 +0000 (23:52 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 29 Jul 2014 21:36:00 +0000 (21:36 +0000)
		1	2
services/audiopolicy/AudioPolicyManager.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/audiopolicy/AudioPolicyManager.h	patch \|	diff1 \|	diff2 \|	blob \| history