Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev am: aef6efeef5

author Stanley Tng <stng@google.com>

Mon, 21 May 2018 20:50:20 +0000 (13:50 -0700)

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

Mon, 21 May 2018 20:50:20 +0000 (13:50 -0700)
author Stanley Tng <stng@google.com>
Mon, 21 May 2018 20:50:20 +0000 (13:50 -0700)
committer android-build-merger <android-build-merger@google.com>
Mon, 21 May 2018 20:50:20 +0000 (13:50 -0700)
diff --cc packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
Simple merge
diff --cc packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
Simple merge
author	Stanley Tng <stng@google.com>
	Mon, 21 May 2018 20:50:20 +0000 (13:50 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 21 May 2018 20:50:20 +0000 (13:50 -0700)
		1	2
packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java	patch \|	diff1 \|	diff2 \|	blob \| history