Merge "API for notification listener for Companioon apps" into oc-dev

author Eugene Susla <eugenesusla@google.com>

Sat, 15 Apr 2017 04:22:48 +0000 (04:22 +0000)

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

Sat, 15 Apr 2017 04:22:48 +0000 (04:22 +0000)
author Eugene Susla <eugenesusla@google.com>
Sat, 15 Apr 2017 04:22:48 +0000 (04:22 +0000)
committer android-build-merger <android-build-merger@google.com>
Sat, 15 Apr 2017 04:22:48 +0000 (04:22 +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
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Eugene Susla <eugenesusla@google.com>
	Sat, 15 Apr 2017 04:22:48 +0000 (04:22 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 15 Apr 2017 04:22:48 +0000 (04:22 +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
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history