OSDN Git Service

merge in nyc-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Thu, 4 Feb 2016 08:00:33 +0000 (00:00 -0800)
committerThe Android Automerger <android-build@google.com>
Thu, 4 Feb 2016 08:00:33 +0000 (00:00 -0800)

Trivial merge