| commit | fdd3103b292e684fc8dc4568834007ca0e31929c | [log] [tgz] |
|---|---|---|
| author | Rahul Sabnis <rahulsabnis@google.com> | Wed Aug 05 22:53:47 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 22:53:47 2020 +0000 |
| tree | 3f688b7d6cec1d2429002f7d2413751d09b31a62 | |
| parent | b43b5d44dba5f77673246e0f62ea59b5e1a4d5ea [diff] | |
| parent | 6b9e6e67f0b0fcf0717bd64af1493db024596106 [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-mr1-dev am: 2e957f2277 -s ours am: 23e40614ba -s ours am: 12ee1721be -s ours am: 8fd8ed9314 -s ours am: 45d1afd1b8 -s ours am: 6b9e6e67f0 -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/+/12307962 Change-Id: I066c91aad2ad5a4a9b8665369c114083d949d755