Merge commit '5d8d5cfaec835f7a4168131c1a508aa71bd788dd' into HEAD

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/SettingsActivity.java

	modified:   Android.mk
	deleted:    AndroidManifest.xml
	modified:   proguard.flags
	modified:   res/values-af/arrays.xml
	modified:   res/values-am/arrays.xml
	modified:   res/values-ar/arrays.xml
	modified:   res/values-bg/arrays.xml
	modified:   res/values-ca/arrays.xml
	modified:   res/values-cs/arrays.xml
	modified:   res/values-da/arrays.xml
	modified:   res/values-de/arrays.xml
	modified:   res/values-el/arrays.xml
	modified:   res/values-en-rGB/arrays.xml
	modified:   res/values-es-rUS/arrays.xml
	modified:   res/values-es/arrays.xml
	modified:   res/values-fa/arrays.xml
	modified:   res/values-fi/arrays.xml
	modified:   res/values-fr/arrays.xml
	modified:   res/values-hi/arrays.xml
	modified:   res/values-hr/arrays.xml
	modified:   res/values-hu/arrays.xml
	modified:   res/values-in/arrays.xml
	modified:   res/values-it/arrays.xml
	modified:   res/values-iw/arrays.xml
	modified:   res/values-ja/arrays.xml
	modified:   res/values-ko/arrays.xml
	modified:   res/values-lt/arrays.xml
	modified:   res/values-lv/arrays.xml
	modified:   res/values-nb/arrays.xml
	modified:   res/values-nl/arrays.xml
	modified:   res/values-pl/arrays.xml
	modified:   res/values-pt-rPT/arrays.xml
	modified:   res/values-pt/arrays.xml
	modified:   res/values-ro/arrays.xml
	modified:   res/values-ru/arrays.xml
	modified:   res/values-sk/arrays.xml
	modified:   res/values-sl/arrays.xml
	modified:   res/values-sr/arrays.xml
	modified:   res/values-sv/arrays.xml
	modified:   res/values-sw/arrays.xml
	modified:   res/values-th/arrays.xml
	modified:   res/values-tl/arrays.xml
	modified:   res/values-tr/arrays.xml
	modified:   res/values-uk/arrays.xml
	modified:   res/values-vi/arrays.xml
	modified:   res/values-zh-rCN/arrays.xml
	modified:   res/values-zh-rTW/arrays.xml
	modified:   res/values-zu/arrays.xml
	modified:   res/values/arrays.xml
	new file:   res/values/slim_arrays.xml
	new file:   res/values/slim_strings.xml
	modified:   res/xml/dashboard_categories.xml
	modified:   res/xml/development_prefs.xml
	new file:   res/xml/display_rotation.xml
	modified:   res/xml/display_settings.xml
	modified:   res/xml/notification_settings.xml
	new file:   res/xml/slim_sound_settings.xml
	modified:   src/com/android/settings/DisplaySettings.java
	new file:   src/com/android/settings/slim/DisplayRotation.java
	new file:   src/com/android/settings/slim/SoundSettings.java

Change-Id: Id4f9eadd8a67d7ab98e0de8c68acd231d9b9c8de