OSDN Git Service

am c8d71801: resolved conflicts for merge of d0d351b2 to gingerbread-plus-aosp