Merge "License header is not correct"
authorJian Huang <huang.jian12@zte.com.cn>
Mon, 10 Oct 2016 08:46:10 +0000 (08:46 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Mon, 10 Oct 2016 08:46:10 +0000 (08:46 +0000)

Trivial merge