OSDN Git Service

resolved conflicts for merge of a905eb62 to mnc-dr-dev-plus-aosp