From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Fri, 5 Mar 2021 18:12:35 +0000 (+0000)
Subject: [automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b395b87b339d7af9046f41d2278cbc33e487e8ef;p=android-x86%2Fsystem-bt.git

[automerger skipped] Merge "DO NOT MERGE Add mutex for std::map in btif_av.cc" into qt-dev am: 8a6fe7c3d9 am: bc5632c80f -s ours am: 19c5352594 am: 7fe606f9f6 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bd372f3e3400d1a22df5da01d198a078e202866
---

b395b87b339d7af9046f41d2278cbc33e487e8ef