Notification Shade

Change-Id: Iedd220a3f6781abb4ecb07d6e429209105e54b9a

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