Derp

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	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
IF CLOCK IS BROKEN, CHECK THIS COMMIT!