| commit | 2fe92c88e76666eec7dc9b4e5d0d23476987c017 | [log] [tgz] |
|---|---|---|
| author | Rahul Sabnis <rahulsabnis@google.com> | Wed Aug 05 23:32:51 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 23:32:51 2020 +0000 |
| tree | 3f688b7d6cec1d2429002f7d2413751d09b31a62 | |
| parent | 63a2b78d27b044822ecc8c802da541bac7bfb900 [diff] | |
| parent | a40a904edc0bfa231e7a2ea91ed27ebe7ea10582 [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: 917b187a17 -s ours am: a40a904edc -s ours am skip reason: Change-Id Ib7575ff3d5f7e0c208743eff652440f7947dfed7 with SHA-1 b9dee21f75 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/12308989 Change-Id: I638a47e7ca9d90be37f086b8fb988640dbaca793