HALO settings

Change-Id: Ie478461e7ccea539cbcccabd577b94036c3a6ba6
halo blacklist (2/2)

Change-Id: I1e5d167a17e398902f6c16b9a872367d2085b314
Merge branch 'multiwindow' of https://bitbucket.org/paranoidandroid/aosp_packages_apps_settings into jellybean
correction

Change-Id: I3e3faea3c67bf26c635f86cc345a9de29bf6728b
black / white list, complete revamp (2/2)

Change-Id: I05891190aface471aa69b7b8eadc7834e06d809f
Merge branch 'multiwindow' of https://bitbucket.org/paranoidandroid/aosp_packages_apps_settings into jellybean

Conflicts:
	res/values/arrays.xml
	src/com/android/settings/paranoid/Toolbar.java