Derp

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java