merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 15 May 2016 00:04:26 +0000 (00:04 +0000)]

Trivial merge