From: The Android Automerger <android-build@google.com>
Date: Wed, 4 May 2016 07:02:44 +0000 (-0700)
Subject: merge in nyc-release history after reset to nyc-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cf1ac6152e444f0297caddf1d9677aae8a4a62e2;p=android-x86%2Fbuild.git

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

cf1ac6152e444f0297caddf1d9677aae8a4a62e2