Merge "The policytype's parent_type definition is error"
authorjulien zhang <zhang.jun3g@zte.com.cn>
Thu, 30 Jun 2016 16:25:42 +0000 (16:25 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 30 Jun 2016 16:25:42 +0000 (16:25 +0000)
commit467b0d29ca83943cc028d776a7cd97522a99644a
tree69c92ffe22a11eed47659650395805102e084591
parent5359c6d752c29d10d8c0459f47bb7697203f1515
parentdc0e2e51304dbc085546ee869617d9c545610667
Merge "The policytype's parent_type definition is error"