OSDN Git Service

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