Settings : Filter spam notifications

Change-Id: I4056aceada3cf8397827037bcb52388de9f8b9fc

Conflicts:

	AndroidManifest.xml
	res/xml/security_settings_app_cyanogenmod.xml
Highlight all search matches for the given constraint.

Change-Id: I9f1a58ee3e6cd59522c4705bedb1457473201d3c
Settings: Fix camel case

Change-Id: Ibc74affb90757f0680e9ce2aa15bc9c4596ec28b

Conflicts:

	res/values/cm_strings.xml
Missing imgsgs

Change-Id: I48189b4923aabfeb2e959ee2509d71b732d0ff8f
Merge remote-tracking branch 'upstream/kk44' into kk44