Merge "update license header"
authorLuji <lu.ji3@zte.com.cn>
Wed, 28 Sep 2016 16:15:38 +0000 (16:15 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Wed, 28 Sep 2016 16:15:38 +0000 (16:15 +0000)

Trivial merge