| commit | 728a61700c5be4c9c23abe4c1fd7e63e1552cc40 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 05 19:38:50 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 19:38:50 2020 +0000 |
| tree | 1937f395c92e9e31d94f4fa3da0895b5b459e3a6 | |
| parent | 2957e4194afeb63fe757a767b326fc57f20ebf29 [diff] | |
| parent | a633da785f82bfb45b55d79c3bb030af4a7c33d8 [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 pi-dev am: 044ef569fd -s ours am: 3603142d39 -s ours am: 2821eb9d5e -s ours am: a633da785f -s ours am skip reason: Change-Id Ib7575ff3d5f7e0c208743eff652440f7947dfed7 with SHA-1 9cfb9204e5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/12307665 Change-Id: Id2e2e42cf6978111dec9ecef29481e34e5e4b1ed