commit | 917b187a177ad554b9250805e11bbf512ef6b082 | [log] [tgz] |
---|---|---|
author | Rahul Sabnis <rahulsabnis@google.com> | Wed Aug 05 22:45:34 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 22:45:34 2020 +0000 |
tree | 29992b1442dc7f72cf6457af5666ea5b77ad9969 | |
parent | 45d1afd1b8d95cdab6b00d1e6f89986de6bb5bb6 [diff] | |
parent | 7ab90f1e7dc4f307f7abeb24159482b1daa0185e [diff] |
[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 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: I2320855e7358659d498c643151a28eadb4d473d1