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

Trivial merge