Merge "fix issue:GSO-89" into sun
authorjin xin <j00101220@huawei.com>
Mon, 31 Oct 2016 10:24:22 +0000 (10:24 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Mon, 31 Oct 2016 10:24:22 +0000 (10:24 +0000)

Trivial merge