Merge "update the json license.txt"
authorjin xin <j00101220@huawei.com>
Tue, 20 Sep 2016 10:07:10 +0000 (10:07 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Tue, 20 Sep 2016 10:07:10 +0000 (10:07 +0000)

Trivial merge