OSDN Git Service

merge in nyc-release history after reset to nyc-dev
authorThe Android Automerger <android-build@google.com>
Thu, 2 Jun 2016 07:03:13 +0000 (00:03 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 2 Jun 2016 07:03:13 +0000 (00:03 -0700)

Trivial merge