OSDN Git Service

Merge tag 'android-7.1.2_r39' into nougat-x86 android-x86-7.1-r3 android-x86-7.1-r4
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 16 Oct 2019 14:30:17 +0000 (22:30 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 16 Oct 2019 14:30:17 +0000 (22:30 +0800)
commitf5493c8de933318f6a99d8a46396741edcfef64f
tree502413cd2647c9b15296609fcfae125fa032a10b
parent9249baa69be947a1015015f14b573a20b423e56e
parent2acb8e2b1ce511bcf73ba131822bef592e9d5981
Merge tag 'android-7.1.2_r39' into nougat-x86

Android 7.1.2 Release 39 (5787804)

Conflicts:
bta/pan/bta_pan_act.c
stack/bnep/bnep_utils.c
device/src/controller.c
osi/src/alarm.c