HALO Mods (2/2)
    * Animation controls

[part 1 in android_frameworks_base]

Conflicts:
	res/values/arrays.xml
	res/values/pa_strings.xml
	res/xml/halo_control.xml
	src/com/android/settings/cyanogenmod/HaloControl.java