Settings: Chamber of secrets 2/2

Change-Id: I56df28a64d38827e409b9711b2b94bcf0672ee9d

Conflicts:

	res/values/custom_strings.xml
	src/com/android/settings/DevelopmentSettings.java