OSDN Git Service

merge in nyc-release history after reset to nyc-dev
authorThe Android Automerger <android-build@google.com>
Sun, 15 May 2016 00:04:50 +0000 (00:04 +0000)
committerThe Android Automerger <android-build@google.com>
Sun, 15 May 2016 00:04:50 +0000 (00:04 +0000)

Trivial merge