Merge "Allow some notifications in a group to be muted" into oc-dev

author Julia Reynolds <juliacr@google.com>

Tue, 25 Apr 2017 19:39:30 +0000 (19:39 +0000)

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

Tue, 25 Apr 2017 19:39:30 +0000 (19:39 +0000)
author Julia Reynolds <juliacr@google.com>
Tue, 25 Apr 2017 19:39:30 +0000 (19:39 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 25 Apr 2017 19:39:30 +0000 (19:39 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Julia Reynolds <juliacr@google.com>
	Tue, 25 Apr 2017 19:39:30 +0000 (19:39 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 25 Apr 2017 19:39:30 +0000 (19:39 +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