| commit | 12ee1721bed57dcb60fb17d3c2ff740afd02e8ad | [log] [tgz] |
|---|---|---|
| author | Rahul Sabnis <rahulsabnis@google.com> | Wed Aug 05 21:37:24 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 21:37:24 2020 +0000 |
| tree | eedb0ab790eeb138e8c4ed6c0455051d17519a7a | |
| parent | 3603142d391754fe6f5dd578eedbbfeeece5f824 [diff] | |
| parent | 23e40614ba812eba067b55c472a58941a819a0d0 [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 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: I2390a2dc2b1317a3a8c3932a98c434260a8831c2