OSDN Git Service

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

Trivial merge