Merge "Remove underscore from Companion service name" into oc-dev am: 885b5f4466

author Eugene Susla <eugenesusla@google.com>

Wed, 26 Apr 2017 00:36:49 +0000 (00:36 +0000)

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

Wed, 26 Apr 2017 00:36:49 +0000 (00:36 +0000)
author Eugene Susla <eugenesusla@google.com>
Wed, 26 Apr 2017 00:36:49 +0000 (00:36 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 26 Apr 2017 00:36:49 +0000 (00:36 +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/java/android/content/Context.java
Simple merge
author	Eugene Susla <eugenesusla@google.com>
	Wed, 26 Apr 2017 00:36:49 +0000 (00:36 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 26 Apr 2017 00:36:49 +0000 (00:36 +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/java/android/content/Context.java	patch \|	diff1 \|	diff2 \|	blob \| history