OSDN Git Service

resolved conflicts for merge of d0d351b2 to gingerbread-plus-aosp