OSDN Git Service

am 24d6f481: resolved conflicts for merge of 3031e475 to gingerbread-plus-aosp