From: Hansong Zhang <hsz@google.com>
Date: Thu, 7 Feb 2019 21:17:35 +0000 (-0800)
Subject: Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9b0e9a32bbce9d1cdc30b3b621b5d5cfce4bd37d;p=android-x86%2Fsystem-bt.git

Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev
am: e145805974

Change-Id: Iaa78778cedd6e04d3cf7d009b81a9599658e6583
---

9b0e9a32bbce9d1cdc30b3b621b5d5cfce4bd37d