vbb
ccc
Merge branch 'master' of https://github.com/hanyong123/my-autotest

Conflicts:
	8196C_EN/config.txt
	8196C_EN/绯荤粺鐧诲綍.txt