From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Wed, 16 Oct 2019 14:30:17 +0000 (+0800)
Subject: Merge tag 'android-7.1.2_r39' into nougat-x86
X-Git-Tag: android-x86-7.1-r3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=refs%2Ftags%2Fandroid-x86-7.1-r4;p=android-x86%2Fsystem-bt.git

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
---

f5493c8de933318f6a99d8a46396741edcfef64f