app ops

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/android/settings/applications/AppOpsDetails.java