From: The Android Automerger <android-build@google.com>
Date: Mon, 9 May 2016 07:02:14 +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=97ce80ea4969c74cb76818db2e82888def81d424;p=android-x86%2Fbuild.git

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

97ce80ea4969c74cb76818db2e82888def81d424