tree b8dc0f7bb84b81442330fca7789b5ef301e4854e
parent c110eca93d69fc336a81360fc22a1e439297f634
parent 3f5ff9e9cde7de6a447b108ae44c84980ce08ff5
author TreeHugger Robot <treehugger-gerrit@google.com> 1598898875 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598898875 +0000

[automerger skipped] Merge "Send a response to an smp security request depending on the callback event" into oc-dev am: 9f1c709363 am: 28de519df5 -s ours am: 9361f12bad -s ours am: dd0f5d9ae0 -s ours am: 69733ee790 -s ours am: 3f5ff9e9cd -s ours

am skip reason: Change-Id Iadeb25a43b46f615b55a0dfb6e7723e5d1204351 with SHA-1 1570e8de12 is in history

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

Change-Id: I9fbacb404e1bc38d72b8c51a5b4df8aeae6a0bc2