From: The Android Automerger <android-build@google.com>
Date: Mon, 2 May 2016 22:20:58 +0000 (-0700)
Subject: merge in nyc-release history after reset to nyc-dev
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fsystem-extras.git;a=commitdiff_plain;h=acc113be46b24f524a823898b6bbf567c302a9a1

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

acc113be46b24f524a823898b6bbf567c302a9a1