Revert "junk"

This reverts commit 326904c12cd4450d792c985066febc400d482415.
Merge remote-tracking branch 'origin/wallpaper' into wallpaper

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java