fix some merge derps, style to our code
	modified:   core/java/android/provider/Settings.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/notification/Hover.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/notification/HoverLayout.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHelper.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	modified:   services/java/com/android/server/NotificationManagerService.java

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java