tree eedb0ab790eeb138e8c4ed6c0455051d17519a7a
parent 12ee1721bed57dcb60fb17d3c2ff740afd02e8ad
parent fee6cdb761fbe214f014e2a781c1ceb28de42baa
author Rahul Sabnis <rahulsabnis@google.com> 1596665691 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596665691 +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-dev am: fd9a792974 am: c0d6bd5f56 -s ours am: c4edc2575e -s ours am: fee6cdb761 -s ours

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

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

Change-Id: I599d2b2af4bdde2684a8997a2d428383ee7afaec