From: Xin Li <delphij@google.com>
Date: Tue, 26 Feb 2019 00:19:46 +0000 (-0800)
Subject: [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a715eacf269c77ffa4cd5519791b19178fcae3f8;p=android-x86%2Fsystem-bt.git

[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 00f9d294b1 -s ours
am skip reason: subject contains skip directive

Change-Id: I5dc1cb04bd75ea5c465ff1671c0ea0372f42ed4b
---

a715eacf269c77ffa4cd5519791b19178fcae3f8