Merge "API fixes for Companion renaming" into oc-dev am: 0a482bda21

author Jeff Sharkey <jsharkey@google.com>

Sat, 29 Apr 2017 19:10:35 +0000 (19:10 +0000)

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

Sat, 29 Apr 2017 19:10:35 +0000 (19:10 +0000)
author Jeff Sharkey <jsharkey@google.com>
Sat, 29 Apr 2017 19:10:35 +0000 (19:10 +0000)
committer android-build-merger <android-build-merger@google.com>
Sat, 29 Apr 2017 19:10:35 +0000 (19: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
author	Jeff Sharkey <jsharkey@google.com>
	Sat, 29 Apr 2017 19:10:35 +0000 (19:10 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 29 Apr 2017 19:10:35 +0000 (19: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