gnow

Change-Id: I39cc77daa0c67bc9fccb5523563e960b05993ee6

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