OSDN Git Service

am 70b4848f: resolved conflicts for merge of c7f23a58 to jb-mr2-dev-plus-aosp