| commit | 23e40614ba812eba067b55c472a58941a819a0d0 | [log] [tgz] |
|---|---|---|
| author | Rahul Sabnis <rahulsabnis@google.com> | Wed Aug 05 21:17:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 21:17:00 2020 +0000 |
| tree | 01d3d55c3ed8666d51ecf53a5cee1efa9ce0f643 | |
| parent | 044ef569fd1af0e34fd0b579fb4d7b1f88e5b10d [diff] | |
| parent | 2e957f22774405d1310329adfe487a8687f3dbd4 [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 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: I7eac7a4bb9cb474634acff417084a7d9b4716ad3