Merge "Fix the bug jUnit caused catalog can not be compiled in Jekins."
authorsun qi <sun.qi310@zte.com.cn>
Wed, 26 Oct 2016 01:21:25 +0000 (01:21 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Wed, 26 Oct 2016 01:21:25 +0000 (01:21 +0000)

Trivial merge