OSDN Git Service

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