merge in nyc-release history after reset to nyc-dev
The Android Automerger [Thu, 31 Mar 2016 07:04:21 +0000 (00:04 -0700)]

Trivial merge