OSDN Git Service

merge in nyc-release history after reset to nyc-dev
authorThe Android Automerger <android-build@google.com>
Thu, 25 Feb 2016 15:32:34 +0000 (07:32 -0800)
committerThe Android Automerger <android-build@google.com>
Thu, 25 Feb 2016 15:32:34 +0000 (07:32 -0800)

Trivial merge