From: The Android Automerger <android-build@google.com>
Date: Tue, 2 Feb 2016 08:00:19 +0000 (-0800)
Subject: merge in nyc-release history after reset to master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=20960b2b40612fcffdb16f4861710bda2e7d1f89;p=android-x86%2Fbuild.git

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

20960b2b40612fcffdb16f4861710bda2e7d1f89