rarara

Conflicts:

	res/xml/device_info_settings.xml