OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
df6c516
56757a4
)
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)
am:
56757a44a6
Change-Id: I3bdacc816923d012f061e5310d5e076fcaf9d387
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
diff --cc
core/java/android/bluetooth/BluetoothDevice.java
Simple merge
diff --cc
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
Simple merge