Settings: Glowpad Torch (3/3)
(1/3 = fwb, 2/3 = packages/apps/Torch)

Conflicts:
	res/values/slim_strings.xml
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/slim/LockscreenInterface.java

Change-Id: Ide6fae8d35afb7f031aefcf6f5703ba57cf1f51d