OSDN Git Service

merge in nyc-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 13 Jan 2016 08:01:07 +0000 (00:01 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 13 Jan 2016 08:01:07 +0000 (00:01 -0800)

Trivial merge