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:10:47 +0000 (19:10 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Wed, 5 Aug 2020 19:10:47 +0000 (19:10 +0000)
commit26511f3923c4ced0aea0f28a5b2a6cb63a2013d0
treee7d343efd8c7aed641b3dbafa83f724295d4d1fd
parentcca9f79c88925f32b65cde5385ab5990894dc76d
parent5667640792931ecf15b72a6f22e69d3df02a7a9d
[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 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: Ia8237e641ef3644f78bb9845e51e5634d76b1b65