OSDN Git Service

resolve merge conflicts of ee186e9 to oc-dev-plus-aosp