Settings: Notification Shortcuts (2/2)
Patchset 2: Added hide carrier label toggle, added multi-user support, fixed whitespace, cleanup of code.

Change-Id: I4e6c460289f5375acb419b4f980be15b290d8596

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/dimens.xml
	src/com/android/settings/Settings.java