OSDN Git Service

Merge 'aosp/upstream-master' into 'aosp/master' am: 01b2926cf7 am: 702c5561af