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

Trivial merge