| commit | 8e710ca120a7692db9bf7a7ab5eb3548ad65ed1d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 05 19:59:17 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 19:59:17 2020 +0000 |
| tree | 8c3e05f2c64ce4d98fb5ea0361b12bd0c4974edf | |
| parent | a017aac516a0aedbcb8925cb6b7e747c3a61d31f [diff] | |
| parent | 728a61700c5be4c9c23abe4c1fd7e63e1552cc40 [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: a633da785f -s ours am: 728a61700c -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: Ife8d56f33e3fbb9369507f27818ef42cb466a525