Signed-off-by: lcy <lcy@lcy.yaozheng.com>
Merge branch 'master' of https://github.com/sgewuhan/visionadapter.git

Conflicts:
	visionadapter/src/com/sg/visionadapter/demo/Demo.java