OSDN Git Service

[automerger skipped] Merge "Check whether local device is an ATV device to determine...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 5 Aug 2020 19:11:14 +0000 (19:11 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Wed, 5 Aug 2020 19:11:14 +0000 (19:11 +0000)
commit6836ded86a017b03611efde40a2fcbda47affa80
tree5684725339c4e4fb591846abf8928d128da32043
parent2727610c3d0d54eb032120beafd5e51a4b3d45ac
parent26511f3923c4ced0aea0f28a5b2a6cb63a2013d0
[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 qt-dev am: 5667640792 -s ours am: 26511f3923 -s ours

am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1 b763abb99e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12307474

Change-Id: I6d16005a708b5fbc178a12cd7a195545aa1b6429