From: Atanas Kirilov <akirilov@google.com>
Date: Fri, 1 Jun 2018 00:02:27 +0000 (-0700)
Subject: Merge changes from topic "am-ba736da7-b534-414b-a405-b0397951e24d" into oc-dev
X-Git-Tag: android-x86-9.0-r1~69^2~2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=85b2e2e5b2;p=android-x86%2Fsystem-bt.git

Merge changes from topic "am-ba736da7-b534-414b-a405-b0397951e24d" into oc-dev
am: c691f7a61d

Change-Id: I49cc66fae3e6bbd7de8589ad6de17d6a5a3e5399
---

85b2e2e5b22e54b9412e9f236c199c6a94f5c002