merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 1 May 2016 07:03:57 +0000 (00:03 -0700)]

Trivial merge