OSDN Git Service

Merge "Partial fix for issue 3124895." into gingerbread