OSDN Git Service

Merge six commits from master-skia to master