Merge "audio policy: manage stream volume per device"

author Eric Laurent <elaurent@google.com>

Wed, 18 Jan 2012 01:34:53 +0000 (17:34 -0800)

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

Wed, 18 Jan 2012 01:34:53 +0000 (17:34 -0800)
author Eric Laurent <elaurent@google.com>
Wed, 18 Jan 2012 01:34:53 +0000 (17:34 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 18 Jan 2012 01:34:53 +0000 (17:34 -0800)
diff --cc include/hardware/audio_policy.h
Simple merge
diff --cc modules/audio/audio_policy.c
Simple merge
author	Eric Laurent <elaurent@google.com>
	Wed, 18 Jan 2012 01:34:53 +0000 (17:34 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 18 Jan 2012 01:34:53 +0000 (17:34 -0800)
		1	2
include/hardware/audio_policy.h	patch \|	diff1 \|	diff2 \|	blob \| history
modules/audio/audio_policy.c	patch \|	diff1 \|	diff2 \|	blob \| history