Revert "settings: Add option to toggle the pointer icon when using stylus"

This reverts commit 95ee4b335a32848d7bd0ec7cae93bffbf24c15de.

Conflicts:
	res/values/strings.xml
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
Switch to AOKP CRT options
Revert "RootBox Settings: Lockscreen Targets"

This reverts commit 9ea4c6e4d7175871e31d805f0641c63bd421070a.

Conflicts:
	AndroidManifest.xml
	res/layout/lockscreen_shortcut_dialog.xml
	res/layout/lockscreen_targets.xml
	res/layout/pick_item.xml
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/rootbox_settings.xml
Fix FC when trying to adjust radio band via *#*#4636#*#* dialer code.

Fixes:

1. Add additional strings to BAND_NAMES array for additional bands from ril.h
2. Fix logic when adding band strings to selection list (for loop ends before entire array is read)

Change-Id: I5ff883a469f757a30c71d7d72c8f6ace19ce7a4d
Signed-off-by: Andrew Xie <andrew.w.xie@gmail.com>
(cherry picked from commit 4845045bb2dfd9b1a67f9f0c62bb44bfc5152284)
Fix duplicate option and strings.
Add PA settings quick access
disable camera sounds (1/3)

Change-Id: Ibc61515e78ecfa1d438b3770b02284c4cb9d7f23
Signed-off-by: sethyx <sethyx@gmail.com>
RB Settings: Fix hardware keys options
Merge remote-tracking branch 'awa/jb-mr1' into jb-mr1

Conflicts:
	AndroidManifest.xml
	res/xml/crom_settings.xml
	src/com/android/settings/CRom.java
	src/com/android/settings/CRom/IconPicker.java
	src/com/android/settings/CRom/Targets.java