Merge camcory settings_test

Conflicts:
	AndroidManifest.xml
	res/values-de/strings.xml
	res/values-it/strings.xml
	res/values-ru/strings.xml
	res/values/strings.xml
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/wifi/WifiSettings.java