Probam

Conflicts:
	res/drawable-nodpi/paclogo.png
	res/values/strings.xml
	res/xml/device_info_settings.xml
	res/xml/settings_headers.xml