OSDN Git Service

resolved conflicts for merge of acb5f383 to jb-dev-plus-aosp