Signed-off-by: cgpllx <cgpllx1@qq.com>
Merge branch 'master' of git@github.com:cgpllx/KcommonTool.git

Conflicts:
	res/values/vpi__styles.xml