Settings : Hardware key rebinding (2/2)

Change-Id: I1a0546f358e787a9c6ab12024e34255475259424

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
Settings: Forward port long-press-back to kill app (1/2)

Change-Id: I60f4b95eb9cc2ef6cf73a5f9317bca066e6bb901

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/DevelopmentSettings.java