Update AndroidManifest.xml

Derp
Merge pull request #43 from Jaiglissechef/patch-1

Update AndroidManifest.xml
HALO: Option to pause the underlying app (2/2)

- adds an option to pause the active app when using HALO
- this is enabled by default for devices with low memory
- (currently: <640MB RAM available to the kernel)

- Also included the string changes
ROMControl: GlowPad Torch (NavRing)

NavRing allows Secure Locks to use
    this feature as well.

PS6: Merge NavRing And LockRing torch into
    one spinner (only one active at once)
PS8: String edit
PS9: Fixed option showing up on devices
    that don't have torch if they clicked
    in the ROMControl>Lockscreens Glowpad
    Also did the same for SW600DP devices
    and the MinimizeChallenge option (they
    have this option hidden on create, so
    this was a bug for them as well).
PS10: Completely align spinner with other
    options
PS11: Rebase
PS12: Small reformatting to match
    AOSP guidelines
PS13: Missed a space
PS14: Despite not having merge errors
    Lockscreens.Java lost a lot of imports
    that were needed.

Change-Id: I4017c97f8f52dfe3019b2bb73ccf839af0948552

Conflicts:
	res/layout-land/lockscreen_targets.xml
	res/layout-sw600dp-land/lockscreen_targets.xml
	res/layout-sw600dp/lockscreen_targets.xml
	res/layout/lockscreen_targets.xml
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/carbon/Lockscreens.java
ROMControl:  Collapse Shade TogglePref

All other toggles set their collapse
    on their own, or should not collapse

Method left in BaseToggle for future
    (if needed) use.
Change-Id: I3250122f9f773df2036a339f896cd42cc07461ae
Germany Translation (1) 

Safe to merge !
-andy :)
Merge pull request #44 from VlikeBanana/patch-3

Germany Translation (1)
German Translation (2)

part 2
,andy
Merge pull request #45 from VlikeBanana/patch-4

German Translation (2)
Fix Translate..
Pie angle, better summary and title

Change-Id: I7ac708f60aad357cfef55b0f732736d96808697a
Merge branch 'jb2' of github.com:CarbonDev/android_packages_apps_Settings into jb2

Conflicts:
	res/values/strings.xml
	src/com/android/settings/carbon/InterfaceSettings.java