OSDN Git Service

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

Trivial merge