Settings: Gesture Lockscreen (2/2)

Conflicts:
	src/com/android/settings/SecuritySettings.java