Merge "Add jianfei.zhang@nokia.com to the contributor(ESCALATOR-22)"
authorJie Hu <hu.jie@zte.com.cn>
Fri, 23 Oct 2015 03:34:07 +0000 (03:34 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 23 Oct 2015 03:34:07 +0000 (03:34 +0000)

Trivial merge