OSDN Git Service

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