Quick Unlock (2/2)

Conflicts:
	res/values/ras_strings.xml

Conflicts:
	res/values/ras_strings.xml