OSDN Git Service

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

Trivial merge