Merge "Bluetooth: Use enums for adapter connection states" am: 95372e873e

author Jack He <siyuanh@google.com>

Tue, 6 Mar 2018 01:17:15 +0000 (01:17 +0000)

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

Tue, 6 Mar 2018 01:17:15 +0000 (01:17 +0000)
author Jack He <siyuanh@google.com>
Tue, 6 Mar 2018 01:17:15 +0000 (01:17 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 6 Mar 2018 01:17:15 +0000 (01:17 +0000)
diff --cc core/java/android/bluetooth/BluetoothAdapter.java
Simple merge
author	Jack He <siyuanh@google.com>
	Tue, 6 Mar 2018 01:17:15 +0000 (01:17 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 6 Mar 2018 01:17:15 +0000 (01:17 +0000)