am 318cd78e: Merge "audio policy: added audio HAL version in audio_policy.conf" into...

author Eric Laurent <elaurent@google.com>

Sat, 7 Jun 2014 10:01:16 +0000 (10:01 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Sat, 7 Jun 2014 10:01:16 +0000 (10:01 +0000)
author Eric Laurent <elaurent@google.com>
Sat, 7 Jun 2014 10:01:16 +0000 (10:01 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Sat, 7 Jun 2014 10:01:16 +0000 (10:01 +0000)
diff --cc services/audiopolicy/AudioPolicyManager.cpp
Simple merge
diff --cc services/audiopolicy/AudioPolicyManager.h
Simple merge
author	Eric Laurent <elaurent@google.com>
	Sat, 7 Jun 2014 10:01:16 +0000 (10:01 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Sat, 7 Jun 2014 10:01:16 +0000 (10:01 +0000)
		1	2
services/audiopolicy/AudioPolicyManager.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/audiopolicy/AudioPolicyManager.h	patch \|	diff1 \|	diff2 \|	blob \| history