merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 10 Apr 2016 07:04:51 +0000 (00:04 -0700)]

Trivial merge