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

Trivial merge