tree 1937f395c92e9e31d94f4fa3da0895b5b459e3a6
parent c1e86f6865e0d6b8da72ebabcd3e58ad62df0f40
parent 45d1afd1b8d95cdab6b00d1e6f89986de6bb5bb6
author Rahul Sabnis <rahulsabnis@google.com> 1596667177 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596667177 +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: 45d1afd1b8 -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: I972738ebd47aea3561e3c85fb2026a9d41689fc5