OSDN Git Service

merge in nyc-release history after reset to nyc-dev
authorThe Android Automerger <android-build@google.com>
Fri, 19 Feb 2016 23:43:11 +0000 (15:43 -0800)
committerThe Android Automerger <android-build@google.com>
Fri, 19 Feb 2016 23:43:11 +0000 (15:43 -0800)

Trivial merge