| commit | 6b9e6e67f0b0fcf0717bd64af1493db024596106 | [log] [tgz] |
|---|---|---|
| author | Rahul Sabnis <rahulsabnis@google.com> | Wed Aug 05 22:38:40 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 22:38:40 2020 +0000 |
| tree | 3f688b7d6cec1d2429002f7d2413751d09b31a62 | |
| parent | 5aefb8e0085ef873613e29c03a4343371ae9602a [diff] | |
| parent | 45d1afd1b8d95cdab6b00d1e6f89986de6bb5bb6 [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 oc-mr1-dev am: 2e957f2277 -s ours am: 23e40614ba -s ours am: 12ee1721be -s ours am: 8fd8ed9314 -s ours am: 45d1afd1b8 -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/+/12307962 Change-Id: I869ea27dc50a7b6150fbc342da66da8e33be0ede