Profiles : Settings

Change-Id: I072758a1c5ec04ef34077551220b6611068fe71d

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml