From: The Android Automerger <android-build@google.com>
Date: Sun, 15 May 2016 00:04:50 +0000 (+0000)
Subject: merge in nyc-release history after reset to nyc-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2b4697d47e36bd215dba6de873babbdec263a067;p=android-x86%2Fsystem-bt.git

merge in nyc-release history after reset to nyc-dev
---

2b4697d47e36bd215dba6de873babbdec263a067