ApnPreference: Fix merge derp

Change-Id: I898620cbed8438fe4effaa463077bf5591f3cba1
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
added CPUInfoService to show online cpus and frequencies (2/2)

Conflicts:
	res/xml/development_prefs.xml
Add Launcher Menu

Conflicts:
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java

Conflicts:
	src/com/android/settings/Settings.java
SoundSettings: Show DSPManager

Change-Id: I199150b82c6f5eb72f419dc8c70fb27ed24fbfda

Conflicts:
	res/xml/sound_settings.xml

Conflicts:
	res/xml/sound_settings.xml

Conflicts:
	res/xml/sound_settings.xml
Full Screen IME and Keyboard (2/2)

Change-Id: Ib57cc5e1cade03fb3664249b0bcfeb0fdbc927aa
Setings: Forward port CM Display Rotation settings

Change-Id: I328421c256f752d1b17539098c10a1de495f39ca

Conflicts:
	res/values/strings.xml
Swap Volume Key on Rotation (2/2)

Change-Id: I44392c6b1184b23c8d940039c940e3039423560d

Conflicts:
	res/values/strings.xml
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