Merge "Add hosts config"
authorJun Li <matthew.lijun@huawei.com>
Wed, 6 Jan 2016 11:10:38 +0000 (11:10 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 6 Jan 2016 11:10:39 +0000 (11:10 +0000)

Trivial merge