merge in nyc-release history after reset to nyc-dev rel-24-uda-r1-partner rel-24-uda-r1.1-partner rel-24-uda-r1.2-partner rel-24-uda-r1.4-partner rel-24-uda-r2-partner
The Android Automerger [Tue, 24 May 2016 07:03:40 +0000 (00:03 -0700)]

Trivial merge