merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 13 Mar 2016 08:02:35 +0000 (00:02 -0800)]

Trivial merge