fix device settings

Conflicts:
	res/drawable-hdpi/ic_settings_advanced.png
	res/values/cm_strings.xml

Change-Id: Ib87213c71b77f3d3fc1f9674e910d03c7cba75ca