OSDN Git Service

Merge "Fix connecting to profiles when bonding from local device (1/3)" am: 44c013d73...
authorJakub Pawlowski <jpawlowski@google.com>
Thu, 6 Oct 2016 21:12:06 +0000 (21:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 21:12:06 +0000 (21:12 +0000)
commit4984d66b6a98fec066f9a16c824dc091b0069037
treeb420b5badfd14f016aea02fbbe1b7694cdb9426b
parentdf6c5162c7a1956fb3e15f420855816c9ac2eaed
parent56757a44a673606c2f84f54967e92f1ce0d2f21b
Merge "Fix connecting to profiles when bonding from local device (1/3)" am: 44c013d739 am: 6fe3900791
am: 56757a44a6

Change-Id: I3bdacc816923d012f061e5310d5e076fcaf9d387
core/java/android/bluetooth/BluetoothDevice.java
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java