From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Wed, 5 Aug 2020 19:38:51 +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=1e9bf31a02;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 pi-dev am: 2b178f7896 -s ours am: 40f09f54ec -s ours am: e1660e8e98 -s ours am: e2e784ea69 -s ours

am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 cd3398b4e2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12307728

Change-Id: I5c26b53f92fe5f385de3d0cb05dae1fc5aeaedd7
---

1e9bf31a02d08bff1ef081c14eac58c6d3a8865d