OSDN Git Service

resolved conflicts for merge of 73083ed1 to lmp-dev-plus-aosp