Return: Smart Pulldown [2/2]

Change-Id: Iba759e421b8cbb02fadaa6540aae7b7a74764293

Conflicts:

	res/values/slim_arrays.xml
	res/values/slim_strings.xml
	res/xml/qs_settings.xml
	src/com/android/settings/slim/QsSettings.java