Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276 am: 6af9bde898 am: 62fc08f684

author Jakub Pawlowski <jpawlowski@google.com>

Fri, 28 Apr 2017 22:10:23 +0000 (22:10 +0000)

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

Fri, 28 Apr 2017 22:10:23 +0000 (22:10 +0000)
author Jakub Pawlowski <jpawlowski@google.com>
Fri, 28 Apr 2017 22:10:23 +0000 (22:10 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 28 Apr 2017 22:10:23 +0000 (22: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	Jakub Pawlowski <jpawlowski@google.com>
	Fri, 28 Apr 2017 22:10:23 +0000 (22:10 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 28 Apr 2017 22:10:23 +0000 (22: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