Merge "Handle Bluetooth is not supported on emulator" into pi-dev am: 942b07da93

author Ryan Lin <ryanywlin@google.com>

Fri, 1 Jun 2018 05:41:53 +0000 (22:41 -0700)

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

Fri, 1 Jun 2018 05:41:53 +0000 (22:41 -0700)
author Ryan Lin <ryanywlin@google.com>
Fri, 1 Jun 2018 05:41:53 +0000 (22:41 -0700)
committer android-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 05:41:53 +0000 (22:41 -0700)
diff --cc src/com/android/settings/sound/AudioSwitchPreferenceController.java
Simple merge
diff --cc tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
Simple merge
author	Ryan Lin <ryanywlin@google.com>
	Fri, 1 Jun 2018 05:41:53 +0000 (22:41 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 1 Jun 2018 05:41:53 +0000 (22:41 -0700)
		1	2
src/com/android/settings/sound/AudioSwitchPreferenceController.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java	patch \|	diff1 \|	diff2 \|	blob \| history