OSDN Git Service

Merge 'aosp/upstream-master' into 'aosp/master' am: 24cb462579 am: 88b0a4235a