Merge "Actually use listener hints?" into pi-dev

author Julia Reynolds <juliacr@google.com>

Tue, 15 Jan 2019 18:20:09 +0000 (10:20 -0800)

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

Tue, 15 Jan 2019 18:20:09 +0000 (10:20 -0800)
author Julia Reynolds <juliacr@google.com>
Tue, 15 Jan 2019 18:20:09 +0000 (10:20 -0800)
committer android-build-merger <android-build-merger@google.com>
Tue, 15 Jan 2019 18:20:09 +0000 (10:20 -0800)
diff --cc services/core/java/com/android/server/notification/NotificationManagerService.java
Simple merge
diff --cc services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java
Simple merge
author	Julia Reynolds <juliacr@google.com>
	Tue, 15 Jan 2019 18:20:09 +0000 (10:20 -0800)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 15 Jan 2019 18:20:09 +0000 (10:20 -0800)
		1	2
services/core/java/com/android/server/notification/NotificationManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java	patch \|	diff1 \|	diff2 \|	blob \| history