Merge "Fix the bug jUnit caused catalog can not be compiled in Jekins." into sun
authorJian Huang <huang.jian12@zte.com.cn>
Wed, 26 Oct 2016 01:45:38 +0000 (01:45 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Wed, 26 Oct 2016 01:45:38 +0000 (01:45 +0000)

Trivial merge