Return: Listanimation views and interpolator [2/2]

Change-Id: I6028fbcb524b68a849a6e3486119d332c12261dd

Conflicts:

	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java