commit | 421861f0f0b01b8c759ba82de5fd3cda753faa1c | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 05 19:58:17 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 19:58:17 2020 +0000 |
tree | 8c3e05f2c64ce4d98fb5ea0361b12bd0c4974edf | |
parent | dc7a2196afe4840c7cf55d4d82e590efa79cf145 [diff] | |
parent | fffc90e71a0108cd611fc2bc700ebf47c65d2c00 [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 qt-qpr1-dev am: add6ebb717 -s ours am: 9ebce05dcf -s ours am: fffc90e71a -s ours am skip reason: Change-Id Ib7575ff3d5f7e0c208743eff652440f7947dfed7 with SHA-1 862adbe357 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/12305956 Change-Id: I853af03fe59e20e5c951cee60005b660e1a8ca3a