OSDN Git Service

resolve merge conflicts of 40da4609e to oc-dr1-dev-plus-aosp