Merge "Follow acronym convention for Companion BLE filter" into oc-dev am: 81d9230c88

author Eugene Susla <eugenesusla@google.com>

Fri, 28 Apr 2017 02:43:14 +0000 (02:43 +0000)

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

Fri, 28 Apr 2017 02:43:14 +0000 (02:43 +0000)
author Eugene Susla <eugenesusla@google.com>
Fri, 28 Apr 2017 02:43:14 +0000 (02:43 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 28 Apr 2017 02:43:14 +0000 (02:43 +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	Eugene Susla <eugenesusla@google.com>
	Fri, 28 Apr 2017 02:43:14 +0000 (02:43 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 28 Apr 2017 02:43:14 +0000 (02:43 +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