*)测试冲突
Merge remote-tracking branch 'origin/master'
哈哈哈
Conflicts:
	res/values/strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml