OSDN Git Service

merge in nyc-release history after reset to nyc-dev
authorThe Android Automerger <android-build@google.com>
Wed, 2 Mar 2016 08:03:19 +0000 (00:03 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 2 Mar 2016 08:03:19 +0000 (00:03 -0800)

Trivial merge