OSDN Git Service

Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am: 93346eae3...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 7 Jan 2021 17:52:27 +0000 (17:52 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 7 Jan 2021 17:52:27 +0000 (17:52 +0000)
commit3981ced364953738edb18f11cc6847424a5d26f0
treef2ef8cf58554dc241837d781a1ce409bd6d3a7f7
parentaaca436d01dc671dcf15d39200e5bcdc4ad637fe
parent2bd6cbf058edaef75a35bc28a701e09501d9f4a3
Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am: 93346eae3a am: 522313bb33 am: 2bd6cbf058

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If134f91b4a058be7abc5f4a49db1ec99540a2ea5
stack/btm/btm_sec.cc