merge in nyc-release history after reset to master
The Android Automerger [Tue, 2 Feb 2016 16:40:26 +0000 (08:40 -0800)]

Trivial merge