OSDN Git Service

Merge remote-tracking branch 'upstream/alteriso-3-mainline' into alteriso-3-mainline
authoryangniao23 <yangniao23@gmail.com>
Wed, 23 Sep 2020 12:37:59 +0000 (21:37 +0900)
committeryangniao23 <yangniao23@gmail.com>
Wed, 23 Sep 2020 12:37:59 +0000 (21:37 +0900)

Trivial merge