Merge "set_mode and set_phone_state now take audio_mode_t"

author Glenn Kasten <gkasten@google.com>

Tue, 17 Jan 2012 19:33:22 +0000 (11:33 -0800)

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

Tue, 17 Jan 2012 19:33:22 +0000 (11:33 -0800)
author Glenn Kasten <gkasten@google.com>
Tue, 17 Jan 2012 19:33:22 +0000 (11:33 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 17 Jan 2012 19:33:22 +0000 (11:33 -0800)
diff --cc include/hardware/audio.h
Simple merge
diff --cc include/hardware/audio_policy.h
Simple merge
diff --cc modules/audio/audio_policy.c
Simple merge
author	Glenn Kasten <gkasten@google.com>
	Tue, 17 Jan 2012 19:33:22 +0000 (11:33 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 17 Jan 2012 19:33:22 +0000 (11:33 -0800)
		1	2
include/hardware/audio.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/hardware/audio_policy.h	patch \|	diff1 \|	diff2 \|	blob \| history
modules/audio/audio_policy.c	patch \|	diff1 \|	diff2 \|	blob \| history