Merge "Fix connecting to profiles when bonding from local device (1/3)" am: 44c013d73...

author Jakub Pawlowski <jpawlowski@google.com>

Thu, 6 Oct 2016 21:12:06 +0000 (21:12 +0000)

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

Thu, 6 Oct 2016 21:12:06 +0000 (21:12 +0000)
author Jakub Pawlowski <jpawlowski@google.com>
Thu, 6 Oct 2016 21:12:06 +0000 (21:12 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 21:12:06 +0000 (21:12 +0000)
diff --cc core/java/android/bluetooth/BluetoothDevice.java
Simple merge
diff --cc packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
Simple merge
author	Jakub Pawlowski <jpawlowski@google.com>
	Thu, 6 Oct 2016 21:12:06 +0000 (21:12 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 6 Oct 2016 21:12:06 +0000 (21:12 +0000)
		1	2
core/java/android/bluetooth/BluetoothDevice.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java	patch \|	diff1 \|	diff2 \|	blob \| history