Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev

author Felipe Leme <felipeal@google.com>

Tue, 28 Jun 2016 20:48:51 +0000 (20:48 +0000)

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

Tue, 28 Jun 2016 20:48:51 +0000 (20:48 +0000)
author Felipe Leme <felipeal@google.com>
Tue, 28 Jun 2016 20:48:51 +0000 (20:48 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 20:48:51 +0000 (20:48 +0000)
diff --cc core/java/android/app/Notification.java
Simple merge
diff --cc services/core/java/com/android/server/notification/NotificationManagerService.java
Simple merge
author	Felipe Leme <felipeal@google.com>
	Tue, 28 Jun 2016 20:48:51 +0000 (20:48 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 28 Jun 2016 20:48:51 +0000 (20:48 +0000)
		1	2
core/java/android/app/Notification.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/notification/NotificationManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history