From: The Android Automerger <android-build@google.com>
Date: Sun, 20 Mar 2016 07:00:46 +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=f6c55f46146ae5899278e49f1f176add0a7bd064;p=android-x86%2Fbuild.git

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

f6c55f46146ae5899278e49f1f176add0a7bd064