Signed-off-by: cheny <chenyue1804@126.com>
Merge branch 'master' of https://github.com/hanyong123/my-autotest
Signed-off-by: cheny <chenyue1804@126.com>
Merge branch 'master' of https://github.com/hanyong123/my-autotest

Conflicts:
	8196C_EN/keyword.txt
	8196C_EN/绔?鍙ｈЕ鍙?.txt
Signed-off-by: cheny <chenyue1804@126.com>
Signed-off-by: cheny <chenyue1804@126.com>