OSDN Git Service

am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp