create
update
修改
Merge branch 'master' of https://github.com/lcxdever/workspaceGit.git

Conflicts:
	testAdn/res/layout/activity_main.xml
	testAdn/src/com/example/testadn/MainActivity.java