OSDN Git Service

merge in nyc-release history after reset to nyc-dev
authorThe Android Automerger <android-build@google.com>
Thu, 24 Mar 2016 16:59:51 +0000 (09:59 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 24 Mar 2016 16:59:51 +0000 (09:59 -0700)

Trivial merge