Remove extra end

Change-Id: I47b998c1a106998fa5bba80bedfaa98f36f6bb2f
[1/2] Settings: HALO

Forward port from jb43.

PS1 : Initial port
PS2 : Fix conflicts with notification LED
PS3 : FIx derp in strings
PS4 : Fix derp in pa_arrays (tag not closed)
PS5 : HALO Mods
PS6 : Update pa_arrays & pa_strings
PS7 : derp: rmv pesky file backups
PS8 : rebased
      Clean some white spaces
      removed some settings
PS9 : Rebase
PS10: Remove unused resources
PS12: Rebase

Change-Id: I7de6a9157415fe05b0a59d8260e33cc1527a342d
Merge branch 'halo' into halo1
Merge branch 'halo1' into halo
Settings: follow kitkat's ui

- manage apps; tab selector and ram usage
- battery data usage bar
- app widget toggle

Change-Id: I804b4b47563545d7ab124f4cc4800ef4034bf754

Conflicts:
	res/values/colors.xml
Merge branch 'halo' into halo1
Merge branch 'ui_white' into white1
Merge branch 'halo1' into halo
Merge branch 'white1' into white2
Merge branch 'halo1' into halo2
Merge branch 'white2' into final2
Merge branch 'halo2' into final2
Merge branch 'final2' into final

Conflicts:
	res/values/pa_arrays.xml

Change-Id: I88166375f18cf737bb45827f8c898b9b42d50d8e
Merge branch 'final' into final2

Change-Id: I4ec88d0115b96790ca6567bc81cb191d022d17db
Battery lights support (2/2)
Forward ported from CM.

Change-Id: I4e4bf03fcec93824a742b760e45a1536a744a0e8

Conflicts:
	src/com/android/settings/DisplaySettings.java

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
Merge branch 'batt_light' into final2
Merge branch 'final2' into final1
[2/2] Settings: Wakelock Blocker

Blocks Wakelocks

Change-Id: I7e53bc7fdebcb9883e3d7337f9bcdd6920887bbc
Merge branch 'wakelock_blocker' into final1

Conflicts:
	AndroidManifest.xml

Change-Id: Icdcefb3f0eb58cdb2e748b3c289bfa2dc55351cc
Animation scale .75

Change-Id: I80372479482d13a027502eca0b24cbed55d339d1