| commit | c4edc2575e8cdad93e528a1314e9a8d1bc46d55f | [log] [tgz] |
|---|---|---|
| author | Rahul Sabnis <rahulsabnis@google.com> | Wed Aug 05 21:35:44 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 21:35:44 2020 +0000 |
| tree | f3a12b5ee1a1511d2c29a0d5b3e971cf14d89470 | |
| parent | 2e957f22774405d1310329adfe487a8687f3dbd4 [diff] | |
| parent | c0d6bd5f562f9a6212a4db762082bbe31fc1ca6c [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 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: If2d541494e42f50fc0d9ed27ad1f21fe760e323f