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

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

b7dde96ae533708c6e1da8065d44b5bbdd5262b6