Merge "Fixed a jump with the panel scrim" into mnc-dev

author Selim Cinek <cinek@google.com>

Wed, 17 Jun 2015 18:23:06 +0000 (18:23 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 17 Jun 2015 18:23:08 +0000 (18:23 +0000)
author Selim Cinek <cinek@google.com>
Wed, 17 Jun 2015 18:23:06 +0000 (18:23 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 17 Jun 2015 18:23:08 +0000 (18:23 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
Simple merge
author	Selim Cinek <cinek@google.com>
	Wed, 17 Jun 2015 18:23:06 +0000 (18:23 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 17 Jun 2015 18:23:08 +0000 (18:23 +0000)
		1	2
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java	patch \|	diff1 \|	diff2 \|	blob \| history