OSDN Git Service

merge in nyc-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 2 Feb 2016 16:40:53 +0000 (08:40 -0800)
committerThe Android Automerger <android-build@google.com>
Tue, 2 Feb 2016 16:40:53 +0000 (08:40 -0800)

Trivial merge