OSDN Git Service

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