OSDN Git Service

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

Trivial merge