From: Sharvil Nanavati <sharvil@google.com>
Date: Wed, 20 Jan 2016 21:07:26 +0000 (+0000)
Subject: Merge "DO NOT MERGE ANYWHERE" into cw-e-dev
X-Git-Tag: android-x86-7.1-r1~75^2^2~26^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=560033035b;p=android-x86%2Fsystem-bt.git

Merge "DO NOT MERGE ANYWHERE" into cw-e-dev
---

560033035b58014aed67701cb3b94b0a98f5c958