From: Hansong Zhang <hsz@google.com>
Date: Thu, 12 Jul 2018 23:31:02 +0000 (-0700)
Subject: Merge changes from topic "am-3e56facc-2987-45a7-902e-643b62b0dad3" into oc-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=953bd8df9b;p=android-x86%2Fsystem-bt.git

Merge changes from topic "am-3e56facc-2987-45a7-902e-643b62b0dad3" into oc-dev
am: c5830db06a

Change-Id: I9c42d24c941977bf803df7c1411622c1a921c7fa
---

953bd8df9b90a15d4cf98298d891fa5ccaee322e