themes

Conflicts:
	res/values/strings.xml