OSDN Git Service

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

Trivial merge