Merge branch 'master' of github.com:josephjsf/myAndroidProj
rm a.txt
Merge branch 'master' of github.com:josephjsf/myAndroidProj