Settings : Hardware key rebinding (2/2)

Change-Id: I1a0546f358e787a9c6ab12024e34255475259424

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
Merge pull request #1 from AOSPA-legacy/lollipop

Settings : Hardware key rebinding (2/2)