[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into pi-dev am:
2b178f7896 -s ours am:
40f09f54ec -s ours am:
e1660e8e98 -s ours am:
e2e784ea69 -s ours
am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1
cd3398b4e2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12307728
Change-Id: I5c26b53f92fe5f385de3d0cb05dae1fc5aeaedd7
OSDN Git Service
