From: The Android Automerger <android-build@google.com>
Date: Sun, 13 Mar 2016 08:01:40 +0000 (-0800)
Subject: merge in nyc-release history after reset to nyc-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fb0f829eb843ba076bc384399f2052b78aa9e425;p=android-x86%2Fframeworks-native.git

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

fb0f829eb843ba076bc384399f2052b78aa9e425