| commit | a017aac516a0aedbcb8925cb6b7e747c3a61d31f | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 05 19:58:48 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 19:58:48 2020 +0000 |
| tree | 8c3e05f2c64ce4d98fb5ea0361b12bd0c4974edf | |
| parent | 421861f0f0b01b8c759ba82de5fd3cda753faa1c [diff] | |
| parent | 2957e4194afeb63fe757a767b326fc57f20ebf29 [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: 2957e4194a -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: I453e481d58b1972e77a5e25b79f1ddef8f1718ba