Perfiles (2/2)

Conflicts:
	res/layout/preference_icon.xml
	res/values/mahdi_arrays.xml
	res/values/mahdi_strings.xml
	res/xml/power_menu_settings.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/purity/PowerMenu.java