commit my android test project
Merge github.com:jxcyly1985/MyAndroidApp

commit conflict