OSDN Git Service

Merge remote-tracking branch 'x86/lollipop-x86' into marshmallow-x86