OSDN Git Service

(root) / android-x86 / system-bt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 36d0e2b) | patch
Resolve merge resolution differences between branches
authorScott James Remnant <keybuk@google.com>
Mon, 19 Oct 2015 23:23:28 +0000 (16:23 -0700)
committerScott James Remnant <keybuk@google.com>
Mon, 19 Oct 2015 23:23:28 +0000 (16:23 -0700)
commit02a29284a26a9d63210865ae9f086c0ad730ca78
tree40ab6713a48778b20ad8c3730b2f86330e8629e5tree | snapshot
parent36d0e2b97be8b04d6607e9c1d76bbd2c9c891305commit | diff
Resolve merge resolution differences between branches

Change-Id: I7b2f5bcf3a43aacdfbb740589ca1538ade149473
audio_a2dp_hw/audio_a2dp_hw.c diff | blob | history
btif/src/btif_pan.c diff | blob | history
osi/src/alarm.c diff | blob | history
system/bt
About OSDN
Find Software
Develop Software
Help