Merge "Do not animate scrims when launching camera" into pi-dev

author Lucas Dupin <dupin@google.com>

Tue, 26 Jun 2018 21:48:16 +0000 (21:48 +0000)

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

Tue, 26 Jun 2018 21:48:16 +0000 (21:48 +0000)
author Lucas Dupin <dupin@google.com>
Tue, 26 Jun 2018 21:48:16 +0000 (21:48 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 26 Jun 2018 21:48:16 +0000 (21:48 +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/StatusBar.java
Simple merge
author	Lucas Dupin <dupin@google.com>
	Tue, 26 Jun 2018 21:48:16 +0000 (21:48 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 26 Jun 2018 21:48:16 +0000 (21:48 +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/StatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history