OSDN Git Service

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)
commitff2742acb20ce2abd86bf6f5980fc310f2013e4e
tree9ee35b7d07ccddaad1c99fe753d13d35db623beb
parentbc918ae656454413b277b4e3302feabbcfea93ee
parent56cdedd92b1bccd35738f832bf97ac57c1dc2169
Merge tag 'android-8.1.0_r69' into oreo-x86

Android 8.1.0 Release 69 (5794017)

Conflicts:
stack/btu/btu_hcif.cc
stack/sdp/sdp_discovery.cc
osi/src/alarm.cc