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)

Trivial merge