Merge "Issue ID: GSO-43" into sun
authorjin xin <j00101220@huawei.com>
Mon, 24 Oct 2016 08:51:26 +0000 (08:51 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Mon, 24 Oct 2016 08:51:26 +0000 (08:51 +0000)

Trivial merge