Merge "Settings: Move strings to cm_strings.xml or cm_arrays.xml" into cm-11.0

Signed-off-by: Scott <scott@ubuntu>

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml

Change-Id: Ic05925bb242d9664b3216bebead7973652e1657e
Settings: Set some strings to translatable="false"

Change-Id: Ica72f4461bbe050587b79c9a4297f34842761a33
Settings : Quick settings/Ribbons (Squashed commit)

Port forward settings for quicksettings/ribbons

Patchset 7: Point to more fitting drawables (blunden)

Change-Id: I2d4659337f48338547a4e6c1efb8b32122319fe3

Add back preference for drawer collapse behaviour

Change-Id: Ic6fa8531f9119447853e2dd3fa033924f0d37091
Signed-off-by: Scott <scott@ubuntu>

Conflicts:
	res/values/cm_strings.xml
	res/xml/settings_headers.xml
Settings: Set some more strings to translatable="false"

Change-Id: I7483044aa396b3c18b2cabf5715dea41ec44ca5b
Signed-off-by: Scott <scott@ubuntu>

Conflicts:
	res/values/cm_strings.xml
rebase cm_strings.

Change-Id: I3818a8c158ad55fc74709dfe4578fa392d2f8145
Signed-off-by: Scott <scott@ubuntu>
Add option to Restart SystemUI to DevSettings

PS2: Fixed the authorship

Change-Id: I14172d3aef32d051b3d5d9ead5a42e4b8d64dd6a
Signed-off-by: Scott <scott@ubuntu>

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/DevelopmentSettings.java

Conflicts:
	res/values/cm_strings.xml
Suspend Actions & Wakelock Blocker (2/3)

Change-Id: I3167307df0adfb393f1cb4bd81496bc5c71a7535
Signed-off-by: Scott <scott@ubuntu>

Conflicts:
	AndroidManifest.xml

Conflicts:
	AndroidManifest.xml
	res/values/bs_strings.xml