From: Xin Li <delphij@google.com>
Date: Tue, 6 Oct 2020 21:15:47 +0000 (+0000)
Subject: [automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 822d747312... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1dc641b0e170f3a3c1520bdf624902c8262152c5;p=android-x86%2Fsystem-bt.git

[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 822d747312 am: 064f2cd106 -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: Ic74e7f30ed12c2f8e22338321832c9a14ec0dd47
---

1dc641b0e170f3a3c1520bdf624902c8262152c5