OSDN Git Service

am 3c935eda: resolved conflicts for merge of 33fddf0c to gingerbread-plus-aosp