Merge "Bluetooth 5 PHY simplification" am: a9acf9db97 am: d43127865b am: ce8de6c3f7

author Jakub Pawlowski <jpawlowski@google.com>

Wed, 12 Apr 2017 22:29:26 +0000 (22:29 +0000)

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

Wed, 12 Apr 2017 22:29:26 +0000 (22:29 +0000)
author Jakub Pawlowski <jpawlowski@google.com>
Wed, 12 Apr 2017 22:29:26 +0000 (22:29 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 22:29:26 +0000 (22:29 +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>
	Wed, 12 Apr 2017 22:29:26 +0000 (22:29 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 12 Apr 2017 22:29:26 +0000 (22:29 +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