Merge "Issue-Id: GSO-88 Fix js error and add i18n support" into sun
authorjin xin <j00101220@huawei.com>
Wed, 2 Nov 2016 08:08:29 +0000 (08:08 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Wed, 2 Nov 2016 08:08:29 +0000 (08:08 +0000)

Trivial merge