Merge "Inherit from oparent"
authorHuabing Zhao <zhao.huabing@zte.com.cn>
Thu, 1 Sep 2016 08:58:12 +0000 (08:58 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Thu, 1 Sep 2016 08:58:12 +0000 (08:58 +0000)
1  2 
pom.xml

diff --cc pom.xml
Simple merge