Fix google string typo

From https://github.com/SlimRoms/packages_apps_Settings/commit/83deba6f8fab84fb4d31c6e2d24317f002d9279d
Hide Superuser and App Ops entries if root access for apps is disabled.

Change-Id: Ibb77ba5a0fccf22564a26b8b1e13f7762c65718e

Conflicts:
	src/com/android/settings/Settings.java
Fix one NPE in tethering setting

Once we not declare BT feature, go Setting->more->tethering
will trigger this NPE.

Change-Id: I4736e7bade261475acda74e26250a81452018ffa
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
Stylus gestures features (2/2)

Forward-port of https://github.com/CyanogenMod/android_packages_apps_Settings/commit/b3d850521e0042b85422903c70130f350f57b87a
to CM-10.1

Change-Id: I0ab78f1129d2d04b0af21e9b38da027dfe3d1295

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java