From: Hansong Zhang <hsz@google.com>
Date: Tue, 25 Sep 2018 04:52:59 +0000 (-0700)
Subject: Merge changes I737a864e,Idc41b2a5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7d92087ec1;p=android-x86%2Fsystem-bt.git

Merge changes I737a864e,Idc41b2a5
am: af09b4eae2

Change-Id: Icdf4f89ec9d36f680f20d54633bd18d23b88c0fb
---

7d92087ec183ff5f80e8d7f359a3a999f57724bc