HALO Mods (2/2)
    * Animation controls

[part 1 in android_frameworks_base]

Change-Id: I7457c9598d55eb3b9c9baec7e1e9e239b68215ad

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml