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)
commitfd993d3d8d8ef3cdab9bdfe8021a09e5f5aececf
tree8efd7b76fe05d94bb758a75e43f9d3061d654652
parentf85f0377b18dd2503e9267f288b2199b28fa39af
parent3ded1ff438a4e5e37f351d1e5390b94a381a2818
Merge "update the json license.txt"