tree 1838f29ed0a11b6a27ae0a70e1945ef85e710168
parent 175e3ac9134efc6ea552d1b01a795529fed129e7
parent 33600006ee4a18bb898b8ced99e601c65b0afccb
author Myles Watson <mylesgw@google.com> 1614983488 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614983488 +0000

[automerger skipped] smp: Reject pairing if the public keys match am: 9af806f8ab -s ours am: 4730839c0c -s ours am: 33600006ee -s ours

am skip reason: Change-Id I0902fdf6bb5c1c7d443fc73fc480d51226fb836b with SHA-1 bb38f5c790 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e17396812c90f45bd3fcf2170656928d552aef1