Skip to content
Commit 231df040 authored by Naveen Kumar's avatar Naveen Kumar
Browse files

Merge commit 'c7def121' into remote 

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

Change-Id: I59608d48881ee8439b63e66cac2a2ee7b6cb81fc
parents 7485ee5c c7def121
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment