tree 908681bdf156db5dad64a934fb8897256b81e7b2
parent 361240755c2ab8ca4184358f51598f7cd111fd0b
parent b87c2eeacfec214f198169319b11e4aca8ab8e87
author Naresh Tanniru <ntanniru@codeaurora.org> 1431506502 +0530
committer Naresh Tanniru <ntanniru@codeaurora.org> 1431506502 +0530

hal: remote merge from master to LA.BR.1 branch

- Merge commit 'b87c2eeacfec214f198169319b11e4aca8ab8e87'

Conflicts:
	hal/Android.mk
	hal/audio_extn/audio_extn.c
	hal/audio_extn/audio_extn.h
	hal/audio_extn/dolby.c
	hal/audio_hw.c
	hal/msm8916/hw_info.c
	hal/msm8916/platform.c
	hal/msm8916/platform.h
	hal/msm8974/platform.c
	hal/platform_api.h
	policy_hal/AudioPolicyManager.cpp

Change-Id: Ic9e8a18a5d82719b02038999c92c9991f843981b