Merge "Fix pep8 errors for conf.py"
authorYujun Zhang <zhang.yujunz@zte.com.cn>
Fri, 15 Jul 2016 09:03:39 +0000 (09:03 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 15 Jul 2016 09:03:39 +0000 (09:03 +0000)

Trivial merge