merge tags 'android-4.2.2_r1' into jb-4.2

Signed-off-by: travp624 <travp624@gmail.com>
Fixed issue with enabling developer settings.

Signed-off-by: Chuck Haines <chaines@codemonkeyjava.com>
settings: Add option to toggle the pointer icon when using stylus

Change-Id: Ib9c22ecb05cc698ead5bfffa34d2a2ffa9c21e13

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

Signed-off-by: Chuck Haines <chaines@codemonkeyjava.com>
Fixed derped merge for pointer settings.

Signed-off-by: Chuck Haines <chaines@codemonkeyjava.com>
Merge remote-tracking branch 'upstream/jb-4.2' into jb-4.2