OSDN Git Service

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

Trivial merge