From: The Android Open Source Project <initial-contribution@android.com>
Date: Tue, 6 Oct 2020 21:15:42 +0000 (+0000)
Subject: [automerger skipped] DO NOT MERGE - Merge RP1A.201005.006 am: 9e1ebdf522 am: bca07e22... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9fb3d9fc6d54dfa78e56c33425e9d08b9cb33c60;p=android-x86%2Fsystem-bt.git

[automerger skipped] DO NOT MERGE - Merge RP1A.201005.006 am: 9e1ebdf522 am: bca07e22d0 -s ours

am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1 342cb328b6 is in history

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

Change-Id: I63ddd1b3c81da071128e2db5ee4252d9817e9c1a
---

9fb3d9fc6d54dfa78e56c33425e9d08b9cb33c60