Merge "Avoid IllegalArgumentException when bluetooth is disabled" am: 2a1bdd2429...

author Deqiang Chen <deqiangc@google.com>

Thu, 14 Mar 2019 23:04:41 +0000 (16:04 -0700)

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

Thu, 14 Mar 2019 23:04:41 +0000 (16:04 -0700)
author Deqiang Chen <deqiangc@google.com>
Thu, 14 Mar 2019 23:04:41 +0000 (16:04 -0700)
committer android-build-merger <android-build-merger@google.com>
Thu, 14 Mar 2019 23:04:41 +0000 (16:04 -0700)
diff --cc core/java/android/bluetooth/BluetoothA2dp.java
Simple merge
diff --cc core/java/android/bluetooth/BluetoothHidHost.java
Simple merge
diff --cc core/java/android/bluetooth/BluetoothPbap.java
Simple merge
author	Deqiang Chen <deqiangc@google.com>
	Thu, 14 Mar 2019 23:04:41 +0000 (16:04 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 14 Mar 2019 23:04:41 +0000 (16:04 -0700)
		1	2
core/java/android/bluetooth/BluetoothA2dp.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/bluetooth/BluetoothHidHost.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/bluetooth/BluetoothPbap.java	patch \|	diff1 \|	diff2 \|	blob \| history