Update crom_strings.xml
Fix FC.
remove shake to secure options from C-Tool.

Signed-off-by: aways <aways@c-rom.org>
derp

Signed-off-by: aways <aways@c-rom.org>
Merge pull request #10 from spillow64/patch-9

Update crom_strings.xml
Remove Battery saver from Tab.

Signed-off-by: aways <aways@c-rom.org>
Merge branch 'kitkat' of github.com:C-RoM-KK/android_packages_apps_Settings into kitkat
Settings: add TEME_SETTINGS intent and SHORTCUT category to
ThemeSettings intent

Change-Id: Ie5d8c401adc612502ff1db27fa4861a27d876a41
Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:
	AndroidManifest.xml
add missing string

Signed-off-by: aways <aways@c-rom.org>
derp

Signed-off-by: aways <aways@c-rom.org>
fix ?

Signed-off-by: aways <aways@c-rom.org>
fix force close
More fixes
Revert "Fix some derps in the battery saver mode which got"

This reverts commit f9f21af1f4616c814582faf8b4a4f09c2bf4669f.
Merge remote-tracking branch 'upstream/kitkat' into kitkat

Conflicts:
	res/xml/crom_interface_settings.xml
	res/xml/crom_lockscreen_settings.xml
	res/xml/crom_settings.xml
	src/com/android/settings/crom/LockscreenSettings.java