Halo (2/2)

Change-Id: Ibe10027ee53172646d70386a00175299c4e56aae

Conflicts:

	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/settings_headers.xml