设定的部分！！！！
Merge branch 'master' of https://github.com/huangtao800/waterTip.git

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of https://github.com/huangtao800/waterTip.git