correct navbar landscape default value for reset

Change-Id: I18e4eb23c34e57e5aed22523b0ebcb3bfda86834
CellBroadcast: Disable App links on wifi-only devices

PatchSet 2: Remove unnecessary check

Change-Id: I359b5fef2932dfa072b72384edf9ba730a1f71a1
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
may need this?

Change-Id: I01352f397380e10a4db0246975352931568e8fba
Signed-off-by: Scott <scott@ubuntu>
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

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

Change-Id: Ica72f4461bbe050587b79c9a4297f34842761a33
rebase cm_strings.

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

Conflicts:
	res/values/cm_strings.xml
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

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

Conflicts:
	res/xml/beanstalk_interface_settings.xml