Merge "Modify license header"
authorHuabingZhao <zhao.huabing@zte.com.cn>
Mon, 26 Sep 2016 12:43:33 +0000 (12:43 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Mon, 26 Sep 2016 12:43:33 +0000 (12:43 +0000)

Trivial merge