From: Andre Eisenbach <eisenbach@google.com>
Date: Sat, 16 Sep 2017 15:33:22 +0000 (+0000)
Subject: Merge changes from topic "am-d37d37956b3e49d89a31faaa131fd1fc" into oc-mr1-dev-plus... 
X-Git-Tag: android-x86-9.0-r1~204^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a91bad79f7793c1765e7cc057817a56b3f85aa70;p=android-x86%2Fsystem-bt.git

Merge changes from topic "am-d37d37956b3e49d89a31faaa131fd1fc" into oc-mr1-dev-plus-aosp
am: af7b3b007f  -s ours

Change-Id: Ie9c4ac48cae1b04cd7d7ea2124715349f951a467
---

a91bad79f7793c1765e7cc057817a56b3f85aa70