merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 11 Apr 2016 18:43:49 +0000 (11:43 -0700)]

Trivial merge