OSDN Git Service

resolved conflicts for merge of ed0bdd42 to lmp-mr1-dev-plus-aosp