| commit | c7d2f481c95643d6cf9b29bed39085896b2c5908 | [log] [tgz] |
|---|---|---|
| author | Rahul Sabnis <rahulsabnis@google.com> | Wed Aug 05 23:32:53 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 23:32:53 2020 +0000 |
| tree | 8c3e05f2c64ce4d98fb5ea0361b12bd0c4974edf | |
| parent | 6b86db5c0f6618f437ea3a9283fbd3bdfe7f3e8e [diff] | |
| parent | 11c2e81b4e8cc27f1ea274d03918b24e2aab16cc [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-dev am: fd9a792974 am: c0d6bd5f56 -s ours am: c4edc2575e -s ours am: fee6cdb761 -s ours am: 31ad158875 -s ours am: 7ab90f1e7d -s ours am: 917b187a17 -s ours am: 11c2e81b4e -s ours am skip reason: Change-Id Ib7575ff3d5f7e0c208743eff652440f7947dfed7 with SHA-1 0b2002b32a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/12308989 Change-Id: I560ab4566d2833254d8ea39932387ddb79f64e32