Lockscreen Targets (PA)

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml