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

Trivial merge