tree 29992b1442dc7f72cf6457af5666ea5b77ad9969
parent b2e53121a598a9e2f58cdda0fdb7c91e736872c4
parent add6ebb7173c58aa016edbccb6fb2af6a8a71f30
author TreeHugger Robot <treehugger-gerrit@google.com> 1596654655 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596654655 +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-qpr1-dev am: add6ebb717 -s ours

am skip reason: Change-Id Ib7575ff3d5f7e0c208743eff652440f7947dfed7 with SHA-1 862adbe357 is in history

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

Change-Id: If8130cbd4456798339ebd430fc94ea17b2d5720c