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:35:45 +0000 (21:35 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Wed, 5 Aug 2020 21:35:45 +0000 (21:35 +0000)
commit14ae20b07257402874cf58cdfa4e34816f99d388
treebf731f264d69f0e99cb9aac38da4726a1135a709
parent4256337c9e9e86392640a8e866c2d5fbd268fdf5
parent00fd683aece05eb33266bda074ddee12ba529055
[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-dev am: b2adda8177 am: 00fd683aec -s ours

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

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

Change-Id: I64045645e5b0c45d25f239f52070f796e8162077