Swap volume buttons (2/2)
Keyboard Auto Rotate (2/2)

Change-Id: I9117438c4368cc25de1ac04b20ad5e9a6efde201

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
Fix NPE with fullscreen keyboard

Change-Id: If831d0758bcaf153d3094c58ddd8ba3f3444ad89
IME toggle (2/2)

Change-Id: I8ff9f6e8915addf9be5d8c6cccd506623d99b920

Conflicts:
	res/values/strings.xml
Fix NPE

Change-Id: I59603e4ef7e9c440000e029427d6ec700888550f
Add back Util function and fix strings
Settings: Option to force keyboard to show enter key (2/2)

Original SlimRoms feature!  Not everyone likes emoticons :-(

Change-Id: I7dc8fd83ecf236ad5279b50ef916d08034c47882

Conflicts:
	res/values/strings.xml
	res/xml/keyboard_input_settings.xml
	src/com/android/settings/slim/KeyboardInputSettings.java