commit

获取最新的
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml