OSDN Git Service

merge in oc-release history after reset to oc-dev
authorgitbuildkicker <android-build@google.com>
Thu, 4 May 2017 00:46:18 +0000 (17:46 -0700)
committergitbuildkicker <android-build@google.com>
Thu, 4 May 2017 00:46:18 +0000 (17:46 -0700)

Trivial merge