OSDN Git Service

resolved conflicts for b8cc54d1 to mnc-dr-dev-plus-aosp