| commit | 25bd25e4c111a16bc1788bb362dcd1695b6c8384 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 05 20:00:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 20:00:25 2020 +0000 |
| tree | 3f688b7d6cec1d2429002f7d2413751d09b31a62 | |
| parent | 52ec6b4f669dc3acbaac951d00e530f4d078e3d4 [diff] | |
| parent | d8c7038992decfd0f5e2074cd4a52006fdcb13b8 [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-dev am: 9ed661f47f -s ours am: 1a3f04aff6 -s ours am: faf0ba6b66 -s ours am: d8c7038992 -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/+/12307662 Change-Id: I01d7ac7817e903e390cdc6690c587a2f269bcb5d