attributes order (synchronization with ics branch)
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	res/layout/animation_speed_dialog.xml
	res/layout/color_dialog.xml