tree 8f27b96b2ffcdf2665cb8d008f7165a396f118e4
parent 7485ee5c0426ebb734741841af1912a09e179061
parent c7def121c0a13733060290f9ce1401ca7cf44405
author Naveen Kumar <kumarn@codeaurora.org> 1497517542 +0530
committer Naveen Kumar <kumarn@codeaurora.org> 1497517542 +0530

Merge commit 'c7def121c0a13733060290f9ce1401ca7cf44405' into remote

Conflicts:
	common/hal_audio.te
	common/nfc.te
	msm8998/qvop.te
	msm8998/system_app.te

Change-Id: I59608d48881ee8439b63e66cac2a2ee7b6cb81fc