| commit | 6b86db5c0f6618f437ea3a9283fbd3bdfe7f3e8e | [log] [tgz] |
|---|---|---|
| author | Rahul Sabnis <rahulsabnis@google.com> | Wed Aug 05 22:53:22 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 22:53:22 2020 +0000 |
| tree | 8c3e05f2c64ce4d98fb5ea0361b12bd0c4974edf | |
| parent | 8e710ca120a7692db9bf7a7ab5eb3548ad65ed1d [diff] | |
| parent | ca831637ceef030fb4d825add7c0095e4fb45481 [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: ca831637ce -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: I7a09624d2753bce922bff862d36bda390ebbf9f3