tree 29992b1442dc7f72cf6457af5666ea5b77ad9969
parent a633da785f82bfb45b55d79c3bb030af4a7c33d8
parent 8fd8ed9314cb2529f1cd99d6eeea37d2e032f888
author Rahul Sabnis <rahulsabnis@google.com> 1596666056 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596666056 +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 oc-mr1-dev am: 2e957f2277 -s ours am: 23e40614ba -s ours am: 12ee1721be -s ours am: 8fd8ed9314 -s ours

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

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

Change-Id: I41addae8850f73c4851f5eb1f39f15e0ec62658d