Merge "this change mainly updating project code"
authorJianlin Lv <jianlin.lv@arm.com>
Wed, 28 Oct 2020 12:14:05 +0000 (12:14 +0000)
committerGerrit Code Review <gerrit@akraino.org>
Wed, 28 Oct 2020 12:14:05 +0000 (12:14 +0000)

Trivial merge