| commit | 5aefb8e0085ef873613e29c03a4343371ae9602a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 05 19:38:44 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 19:38:44 2020 +0000 |
| tree | 3f688b7d6cec1d2429002f7d2413751d09b31a62 | |
| parent | d8c7038992decfd0f5e2074cd4a52006fdcb13b8 [diff] | |
| parent | a633da785f82bfb45b55d79c3bb030af4a7c33d8 [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 skip reason: Change-Id Ib7575ff3d5f7e0c208743eff652440f7947dfed7 with SHA-1 9cfb9204e5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/12307665 Change-Id: I426d14d5042ec6cbb05ce6a9c8814ccc0caac715