OSDN Git Service

resolved conflicts for merge of 57e82aad to mnc-dev-plus-aosp