OSDN Git Service

Merge "Merge remote-tracking branch 'aosp/upstream-master' into 'aosp/master'"
authorTreehugger Robot <treehugger-gerrit@google.com>
Fri, 11 Dec 2020 22:51:03 +0000 (22:51 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 11 Dec 2020 22:51:03 +0000 (22:51 +0000)

Trivial merge