Merge "Notify apps when channels/groups are blocked/unblocked"

author TreeHugger Robot <treehugger-gerrit@google.com>

Wed, 22 Nov 2017 15:55:53 +0000 (15:55 +0000)

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

Wed, 22 Nov 2017 15:55:53 +0000 (15:55 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 22 Nov 2017 15:55:53 +0000 (15:55 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 22 Nov 2017 15:55:53 +0000 (15:55 +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 core/res/AndroidManifest.xml
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 22 Nov 2017 15:55:53 +0000 (15:55 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 22 Nov 2017 15:55:53 +0000 (15:55 +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
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history