[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 oc-mr1-dev am:
4256337c9e -s ours am:
d24757a4f0 -s ours am:
0b6fe27c5f -s ours am:
bd13a8fe3d -s ours am:
aeda81c1d5 -s ours
am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1
ad8fba09ac is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12307949
Change-Id: If8f5b2b9b2d7635f55dde196824a1456cc6acae8
OSDN Git Service
