OSDN Git Service
(root)
/
android-x86
/
packages-apps-Bluetooth.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
30e615d
22e1e35
)
resolved conflicts for merge of 22e1e357 to master
author
Jean-Baptiste Queru
<jbq@google.com>
Tue, 7 Dec 2010 21:51:14 +0000
(13:51 -0800)
committer
Jean-Baptiste Queru
<jbq@google.com>
Tue, 7 Dec 2010 21:51:14 +0000
(13:51 -0800)
Change-Id: I96ff536c0d1c000a6b6d5b0b2ea5a3849b21985e
1
2
src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/bluetooth/pbap/BluetoothPbapService.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
Simple merge
diff --cc
src/com/android/bluetooth/pbap/BluetoothPbapService.java
Simple merge
diff --cc
src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
Simple merge
OSDN Git Service
