From: Rahul Sabnis <rahulsabnis@google.com>
Date: Wed, 5 Aug 2020 21:17:00 +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=d24757a4f0;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 oc-mr1-dev am: 4256337c9e -s ours

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

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

Change-Id: Icdcade676ae8c5cf2b05f42ce92611c97afd2b68
---

d24757a4f044714b59eca9ee33f3afd3eaa4a487