From: The Android Automerger <android-build@google.com>
Date: Tue, 22 Mar 2016 07:00:43 +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=21f5c8b4c18539be9ed4cf44c8be59151b01b43e;p=android-x86%2Fbuild.git

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

21f5c8b4c18539be9ed4cf44c8be59151b01b43e