Merge "PrivacyGuard : Reimplement to use appops" into cm-10.2
Conflicts:
	res/values/cm_strings.xml
Merge "Improve app op details layout." into cm-10.2
Merge "Save last list position in privacy guard manager." into cm-10.2