ugh

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java