Long press back kill app (2/2)

Conflicts:
	res/values/strings.xml
Add Display Rotation settings

Originaly authored by Robert Burns (burnsra)

Change-Id: I4f96b3f804ee4732b277c35340790f3561d69764

Conflicts:
	res/values/strings.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	res/values/strings.xml
	src/com/android/settings/DisplaySettings.java