Needed some fixing

Change-Id: Ic9c75da143449d1720bec858af9330b1357a6559

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