deleted:    strings.xml~
	modified:   ../../../../packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	deleted:    ../../../../packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java.orig
	deleted:    ../../../../packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java.orig