project first commit.
project 3333 commit.
project 3333 commit.
Merge branch 'develop'

Conflicts:
	src/com/example/AndroidGitDemo/MyActivity.java
Merge branch 'develop'

Conflicts:
	src/com/example/AndroidGitDemo/MyActivity.java
Merge branch 'develop'

Conflicts:
	src/com/example/AndroidGitDemo/MyActivity.java
commit git method 3.