Fix derp.

Change-Id: I2766f4c89460c967e32349be008e38b3600b7e76
Lockscreen : Gesture Unlock

Change-Id: I154ccdd26f4607f4b6f4d0ad1fe795dc25bd630b

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