OSDN Git Service

merge in nyc-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Mon, 1 Feb 2016 13:12:05 +0000 (05:12 -0800)
committerThe Android Automerger <android-build@google.com>
Mon, 1 Feb 2016 13:12:05 +0000 (05:12 -0800)

Trivial merge