OSDN Git Service

resolve merge conflicts of 6ecc54a7 to stage-aosp-master