tree 93b8cad7a832c2c75ce08baba97f107d27119681
parent d400306b6e48b2d7bf25f5ebef1a2dec357250df
parent 0110e267d11ed5aa7a64a306771e71aeb289db6a
author Naveen Kumar <kumarn@codeaurora.org> 1460498428 +0530
committer Naveen Kumar <kumarn@codeaurora.org> 1460498428 +0530

Merge commit '0110e267d11ed5aa7a64a306771e71aeb289db6a' into remote

Conflicts:
	policy_hal/AudioPolicyManager.cpp

Change-Id: Ia056c051af478e9853a05fea0ee2c8c7eca0670a