OSDN Git Service

merge in nyc-mr1-release history after reset to nyc-mr1-dev
authorgitbuildkicker <android-build@google.com>
Sat, 6 Aug 2016 00:01:58 +0000 (17:01 -0700)
committergitbuildkicker <android-build@google.com>
Sat, 6 Aug 2016 00:01:58 +0000 (17:01 -0700)

Trivial merge