From: The Android Automerger <android-build@google.com>
Date: Sun, 22 May 2016 07:04:01 +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=d7e29ca390cb50fcc80583d1badba86542dd4bd6;p=android-x86%2Fframeworks-native.git

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

d7e29ca390cb50fcc80583d1badba86542dd4bd6