tree b193b62a5fbe89e7eb90d36bb9e7f766598b3d73
parent 8dfb9f372e5ea3d2a0b73f38e6d94b384b14cc69
parent 79451c85ae9a3532d2d52c5aadbfd707df415372
author Naveen Kumar <kumarn@codeaurora.org> 1497611339 +0530
committer Naveen Kumar <kumarn@codeaurora.org> 1497611339 +0530

Merge commit '79451c85ae9a3532d2d52c5aadbfd707df415372' into remote

Conflicts:
	common/file_contexts
	common/hal_camera.te
	common/radio.te
	common/system_app.te

Change-Id: I32fc385e14582dd84feedd15e83074f0a1bbf6bf