derp
-sloppy pick
Settings: ES translations

Change-Id: Ieca8e038676beffe8638c3e529b21a488df15abe
Lockscreen: Notifications: Fix for devices without proximity sensor

*also fix some dependencies

Conflicts:
	src/com/android/settings/candykat/LockscreenNotifications.java

 Author:    Darescu Ionut <ionut.darescu@gmail.com>
Merge branch 'ck44' into stage