stupid derpage

Change-Id: I0d9af34bbb53cf3bde21cdeb430de3d16b75679c
Signed-off-by: Scott <scott@ubuntu>

Conflicts:
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java