Merge "Fix gatewayUri error"
authorLuji <lu.ji3@zte.com.cn>
Wed, 28 Sep 2016 02:29:16 +0000 (02:29 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Wed, 28 Sep 2016 02:29:16 +0000 (02:29 +0000)

Trivial merge