| commit | fee6cdb761fbe214f014e2a781c1ceb28de42baa | [log] [tgz] |
|---|---|---|
| author | Rahul Sabnis <rahulsabnis@google.com> | Wed Aug 05 21:53:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 05 21:53:28 2020 +0000 |
| tree | 01d3d55c3ed8666d51ecf53a5cee1efa9ce0f643 | |
| parent | 23e40614ba812eba067b55c472a58941a819a0d0 [diff] | |
| parent | c4edc2575e8cdad93e528a1314e9a8d1bc46d55f [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 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: I0d1a6ac5c76c5b196c3c04ab9f53a879c3a32a44