From: TreeHugger Robot Date: Wed, 5 Aug 2020 19:11:14 +0000 (+0000) Subject: [automerger skipped] Merge "Check whether local device is an ATV device to determine... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6836ded86a;p=android-x86%2Fsystem-bt.git [automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into qt-dev am: 5667640792 -s ours am: 26511f3923 -s ours am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 b763abb99e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12307474 Change-Id: I6d16005a708b5fbc178a12cd7a195545aa1b6429 --- 6836ded86a017b03611efde40a2fcbda47affa80