Lockscreen Blur

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SecuritySettings.java

Conflicts:
	res/values/ose_strings.xml
	res/values/strings.xml
	src/com/android/settings/SecuritySettings.java