| commit | a633da785f82bfb45b55d79c3bb030af4a7c33d8 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 05 19:28:52 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 19:28:52 2020 +0000 |
| tree | 29992b1442dc7f72cf6457af5666ea5b77ad9969 | |
| parent | faf0ba6b66d513f48a68ccac464f4d6479835589 [diff] | |
| parent | 2821eb9d5e09111c988a574aabf8ce3bbe9096e7 [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 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: Ia5382f338e0617bec77c1ae8c770034a1d673bb2