Merge "Bluetooth 5 periodc scan API (1/2)"

author Jakub Pawlowski <jpawlowski@google.com>

Wed, 8 Mar 2017 19:14:22 +0000 (19:14 +0000)

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

Wed, 8 Mar 2017 19:14:22 +0000 (19:14 +0000)
author Jakub Pawlowski <jpawlowski@google.com>
Wed, 8 Mar 2017 19:14:22 +0000 (19:14 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 8 Mar 2017 19:14:22 +0000 (19:14 +0000)
diff --cc Android.mk
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/bluetooth/BluetoothAdapter.java
Simple merge
author	Jakub Pawlowski <jpawlowski@google.com>
	Wed, 8 Mar 2017 19:14:22 +0000 (19:14 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 8 Mar 2017 19:14:22 +0000 (19:14 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/bluetooth/BluetoothAdapter.java	patch \|	diff1 \|	diff2 \|	blob \| history