Merge "Allow apps to know what users think of their notifications." into nyc-dev

author Julia Reynolds <juliacr@google.com>

Wed, 10 Feb 2016 14:10:23 +0000 (14:10 +0000)

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

Wed, 10 Feb 2016 14:10:24 +0000 (14:10 +0000)
author Julia Reynolds <juliacr@google.com>
Wed, 10 Feb 2016 14:10:23 +0000 (14:10 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 10 Feb 2016 14:10:24 +0000 (14:10 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc services/core/java/com/android/server/notification/NotificationManagerService.java
Simple merge
author	Julia Reynolds <juliacr@google.com>
	Wed, 10 Feb 2016 14:10:23 +0000 (14:10 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 10 Feb 2016 14:10:24 +0000 (14:10 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/notification/NotificationManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history