OSDN Git Service

resolved conflicts for merge of 32912e0a to stage-aosp-master