OSDN Git Service

merge in nyc-release history after reset to nyc-dev
authorThe Android Automerger <android-build@google.com>
Mon, 4 Apr 2016 19:15:48 +0000 (12:15 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 4 Apr 2016 19:15:48 +0000 (12:15 -0700)

Trivial merge