tree 1937f395c92e9e31d94f4fa3da0895b5b459e3a6
parent dd92ba2ed8dc640d28290cbc40dc887832cef74c
parent 917b187a177ad554b9250805e11bbf512ef6b082
author Rahul Sabnis <rahulsabnis@google.com> 1596668592 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596668592 +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: 31ad158875 -s ours am: 7ab90f1e7d -s ours am: 917b187a17 -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: Id96465ad54820c13e1b0412c00921d7252179eb6