From: The Android Automerger <android-build@google.com>
Date: Tue, 2 Feb 2016 16:40:26 +0000 (-0800)
Subject: merge in nyc-release history after reset to master
X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=android%2Fplatform%2Fhardware%2Fgoogle%2Fapf.git;a=commitdiff_plain;h=5096d9cd662c6bbfe0304d41cceb309a14179ee0

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

5096d9cd662c6bbfe0304d41cceb309a14179ee0