| commit | 22ed1cc89d42468938f0a5975620ac1641249fe7 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 05 20:00:53 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 20:00:53 2020 +0000 |
| tree | 3f688b7d6cec1d2429002f7d2413751d09b31a62 | |
| parent | 25bd25e4c111a16bc1788bb362dcd1695b6c8384 [diff] | |
| parent | 5aefb8e0085ef873613e29c03a4343371ae9602a [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 pi-dev am: 044ef569fd -s ours am: 3603142d39 -s ours am: 2821eb9d5e -s ours am: a633da785f -s ours am: 5aefb8e008 -s ours am skip reason: Change-Id Ib7575ff3d5f7e0c208743eff652440f7947dfed7 with SHA-1 b11ac32ea3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/12307665 Change-Id: I4d6eb69b19c75dcdcd9c99fc0ea9f6092d8c2420