OSDN Git Service

(root) / android-x86 / system-bt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc918ae 56cdedd)
Merge tag 'android-8.1.0_r69' into oreo-x86 android-x86-8.1-r3
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 15 Oct 2019 08:47:31 +0000 (16:47 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 15 Oct 2019 08:47:31 +0000 (16:47 +0800)
Android 8.1.0 Release 69 (5794017)

Conflicts:
stack/btu/btu_hcif.cc
stack/sdp/sdp_discovery.cc

1  2 
osi/src/alarm.cc patch | diff1 | diff2 | blob | history

diff --cc osi/src/alarm.cc
Simple merge
system/bt
About OSDN
Find Software
Develop Software
Help