tree db65be2411b273ab8b5932c8b524ccf047614b0a
parent 8fd8ed9314cb2529f1cd99d6eeea37d2e032f888
parent 31ad1588751509b9ecf72e3ff43519fcf3339138
author Rahul Sabnis <rahulsabnis@google.com> 1596666537 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596666537 +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 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: I536915217209b28e39558b39a01ba96b39426bc6