Call ParanoidOTA on system updates check

Change-Id: Ic4332fb223ef24b28a26b183a7e6b326a5bbb78c

Conflicts:

	src/com/android/settings/DeviceInfoSettings.java
Cleanup for commit f4a421a

* Fix brace style
* Change contentResolver
* Fix string key names and string language

Signed-off-by: Evan Anderson <evan1124@gmail.com>

PS3:

* Gerrit history changed, fixed conflicts for merging it.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>

Change-Id: I82d90a54fbfe5bdc48d2ea32eebd671e0303b6f9
Merge "Call ParanoidOTA on system updates check" into kitkat
Revert "Disable AppOps for real."

This reverts commit 64b28a0dcc174827e551f4c7e71e4268bd0f5bba.
Spanish translation and a few of fixes to english ones

Change-Id: I2a4f25296f08852246e7c20bd7c55b58c425874e
Merge "Revert "Disable AppOps for real."" into kitkat
Merge remote-tracking branch 'PA-settings/kitkat' into kitkat

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java
Remove ParanoidOTA

This is an unofficial build
Revert "Remove ParanoidOTA"

This reverts commit 03ecb43db691cb9080c6b18c165f19861aea99c8.
Remove Paranoid OTA
Volume Rocker: Hardcode music track seek option (2/2).

* The feature is enabled by default but not configurable.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Lockscreen Blur (2/2)
Merge branch 'kitkat' of github.com:AOSPA/android_packages_apps_Settings into kitkat

Conflicts:
	res/xml/sound_settings.xml
Lockscreen: Add timeout and instant lock option to slide lock (1/2)

  This adds AOSP's new timeout and instant lock options to the
  slide (aka chooser) style lockscreen.

Change-Id: Ide8e8d14603e5111debcc7a7cf6c4b74898bfa3d
Add back increasing ring settings.

Change-Id: If33afa88adde6ae6fa23f0e3be779b1b7531e3a3

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
Fix merge
Merge branch 'kitkat' of github.com:ModdedPA/android_packages_apps_Settings into kitkat
Merge remote-tracking branch 'settings/kitkat' into kitkat-test

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml