halo blacklist (1/2) [second half settings!]

Change-Id: I406c3af0360979dad2746ad7b395c0a961e74301

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/Halo.java
Revert "halo blacklist (1/2) [second half settings!]"

This reverts commit 9c5b643b679532759bfb453761da7c0fd2611763.
Merge branch 'jellybean' of github.com:bhargz/frameworks_base into jellybean
halo blacklist (1/2) [second half settings!]

Change-Id: I406c3af0360979dad2746ad7b395c0a961e74301