OSDN Git Service

[automerger skipped] Merge "Check whether local device is an ATV device to determine...
authorRahul Sabnis <rahulsabnis@google.com>
Wed, 5 Aug 2020 21:17:00 +0000 (21:17 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Wed, 5 Aug 2020 21:17:00 +0000 (21:17 +0000)
commitd24757a4f044714b59eca9ee33f3afd3eaa4a487
tree5ee0a6d96f4c7bdef578c775798577c0a2c1791a
parent2b178f789689929173288e06c6d88d9b891b483e
parent4256337c9e9e86392640a8e866c2d5fbd268fdf5
[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 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: Icdcade676ae8c5cf2b05f42ce92611c97afd2b68