Settings: ES translations

Change-Id: I325e0c5eacf8a892519ffe81ab2280c7279aab3b
AppOps: fix translations

errors caused by http://review.cyanogenmod.org/#/c/60809

Change-Id: I5b26ad5de77de8cc1b2164f75bc3f52ed864edab
Revert "Remove CMUpdater (2/2)"

This reverts commit eabebcba6e0ea2b02efb9ca90a92e79fbacdc03b.

Conflicts:
	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java

Change-Id: I1e33a06df51d7202399169b835b883ad37bf8f67
Merge "Settings: ES translations" into cm-11.0
Merge "AppOps: fix translations" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Don't hide baseband on dual sim devices

Change-Id: I03a531969e733bf9d8f259c0c473d1bae53b7bc1
Look for the msim settings in the new location deviceinfo/msim

Change-Id: I4e81b9c895b11e0a851ad81601271888dfd4f855
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Performance: add swap, swap priority preferences

Utilizes two properties to control swap:
* persist.sys.swap (0, 1; activation)
* persist.sys.swap_pri (0, 2; the actual priority that will be used)

Change-Id: I60a195de279a6e5f786658945e554cc957af9031
Merge "Don't hide baseband on dual sim devices" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of https://github.com/androidarmv6/android_packages_apps_Settings into cm-11.0