merging fuck up

Change-Id: I0d57efad380e6ea070b31b28695385c2e6b57772

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml