OSDN Git Service

resolve merge conflicts of 148db9dfa669 to oc-mr1-dev