fixed bad merge

added back files that were deleted

	new file:   Android.mk
	deleted:    res/values-ca/arrays.xml
	deleted:    res/values-ca/strings.xml
	new file:   res/values-de/strings.xml
	new file:   res/values-fr/strings.xml
	new file:   res/values-it/strings.xml
	new file:   res/values-ja/strings.xml
	new file:   res/values-pl/strings.xml