Merge "Use correct type for hardware call state"

author Glenn Kasten <gkasten@google.com>

Wed, 11 Jan 2012 18:25:23 +0000 (10:25 -0800)

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

Wed, 11 Jan 2012 18:25:23 +0000 (10:25 -0800)
author Glenn Kasten <gkasten@google.com>
Wed, 11 Jan 2012 18:25:23 +0000 (10:25 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 11 Jan 2012 18:25:23 +0000 (10:25 -0800)
diff --cc services/audioflinger/AudioFlinger.cpp
Simple merge
diff --cc services/audioflinger/AudioFlinger.h
Simple merge
author	Glenn Kasten <gkasten@google.com>
	Wed, 11 Jan 2012 18:25:23 +0000 (10:25 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 11 Jan 2012 18:25:23 +0000 (10:25 -0800)
		1	2
services/audioflinger/AudioFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/audioflinger/AudioFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history