Merge "Normalize line endings"
authorLuji <lu.ji3@zte.com.cn>
Fri, 16 Sep 2016 05:43:03 +0000 (05:43 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Fri, 16 Sep 2016 05:43:03 +0000 (05:43 +0000)

Trivial merge