Hardware tunalbles

Conflicts:
	Android.mk
	res/values/strings.xml