tree 29992b1442dc7f72cf6457af5666ea5b77ad9969
parent 9ebce05dcffe629c71eb3137a5bbc3d56a9f7b09
parent 1a3f04aff6c42894a7c4e472e701c146bc7f15fa
author TreeHugger Robot <treehugger-gerrit@google.com> 1596654674 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596654674 +0000

[automerger skipped] Merge "Pass whether the local device is an atv device to the native layer to determine whether to include pairing dialogs for justworks and encryption only LE pairing" into qt-dev am: 9ed661f47f -s ours am: 1a3f04aff6 -s ours

am skip reason: Change-Id Ib7575ff3d5f7e0c208743eff652440f7947dfed7 with SHA-1 4cb0194805 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/12307662

Change-Id: I70b50a82a2fa4ccae85eb32bf2b15d924630e3c4