| commit | 2957e4194afeb63fe757a767b326fc57f20ebf29 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 05 19:38:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 19:38:25 2020 +0000 |
| tree | 1937f395c92e9e31d94f4fa3da0895b5b459e3a6 | |
| parent | fffc90e71a0108cd611fc2bc700ebf47c65d2c00 [diff] | |
| parent | faf0ba6b66d513f48a68ccac464f4d6479835589 [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 skip reason: Change-Id Ib7575ff3d5f7e0c208743eff652440f7947dfed7 with SHA-1 4cb0194805 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/12307662 Change-Id: Ifd3b9c90785a210ab65261a01bd52db6adec8124