Merge "Hiding replied notification icons from AOD" into pi-dev am: 37e96a8fa5

author Selim Cinek <cinek@google.com>

Fri, 15 Jun 2018 23:45:00 +0000 (16:45 -0700)

committer android-build-merger <android-build-merger@google.com>

Fri, 15 Jun 2018 23:45:00 +0000 (16:45 -0700)
author Selim Cinek <cinek@google.com>
Fri, 15 Jun 2018 23:45:00 +0000 (16:45 -0700)
committer android-build-merger <android-build-merger@google.com>
Fri, 15 Jun 2018 23:45:00 +0000 (16:45 -0700)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
Simple merge
author	Selim Cinek <cinek@google.com>
	Fri, 15 Jun 2018 23:45:00 +0000 (16:45 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 15 Jun 2018 23:45:00 +0000 (16:45 -0700)
		1	2
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java	patch \|	diff1 \|	diff2 \|	blob \| history