Merge "Add Quad channel output to AudioPolicyManager" into lmp-dev

author Andy Hung <hunga@google.com>

Wed, 30 Jul 2014 18:08:00 +0000 (18:08 +0000)

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

Tue, 29 Jul 2014 22:44:51 +0000 (22:44 +0000)
author Andy Hung <hunga@google.com>
Wed, 30 Jul 2014 18:08:00 +0000 (18:08 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 29 Jul 2014 22:44:51 +0000 (22:44 +0000)
diff --cc services/audiopolicy/AudioPolicyManager.cpp
Simple merge
author	Andy Hung <hunga@google.com>
	Wed, 30 Jul 2014 18:08:00 +0000 (18:08 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 29 Jul 2014 22:44:51 +0000 (22:44 +0000)