From: Jakub Pawlowski <jpawlowski@google.com>
Date: Thu, 16 Feb 2017 20:15:22 +0000 (+0000)
Subject: Merge changes Idcbbc7eb,I3dc48800
X-Git-Tag: android-x86-8.1-r1~196^2~67^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9f0ff40820;p=android-x86%2Fsystem-bt.git

Merge changes Idcbbc7eb,I3dc48800
am: 6f04f03f44

Change-Id: I690e029727e74f6c948ff29be79f2c90645d5a9c
---

9f0ff40820c8c2eba0ad1bb718e7d3d4b7a78556