mw: mess

Change-Id: I8b5ccd6c1c4211764160bc54b65032819a259921

Conflicts:

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