Merge "Development settings: Move hostname under ADB over network" into cm-11.0
Wi-Fi AP priorities: Add RTL support

Change-Id: Ie24f6e4fc37e2ffc9a0e830d4287fbe7b2935a63
Settings: add Chinese Simplified translations

Port from cm-10.2, thanks Andrew Jiang and other Chinese Simplified
translators.

Change-Id: I1a1fe6d08373ac4c872ce78dfe487fa17eded0a8
Address the 'ART' Issue

Rather than outright remove this completely, address primary concerns:

* Add a more verbose warning message on alert dialog
* Explicitly state experimental form
* Explicitly state not supported (no bug reports)
* Explicitly state issues (crashes, bootloop, etc)

Additionally, move option to 'Apps' header (bottom), as this is it's
primary impact.

See prior discussion: http://review.cyanogenmod.org/#/c/55609/

PS2: Linkify

Change-Id: Icf103b5576c8e93f8a30ccd348476bf207401355
Settings: remove preference if device hasn't LockClock installed

Change-Id: I8b43501af12a3f4eba3a4ee87dbd416662639886
Settings: PT-BR Translations

Change-Id: I7f7440d77c658b781f52efbc8742b67b5c23e122
Settings: Long Term Orbits (LTO)

Ported from http://review.cyanogenmod.org/#/c/51422/3

Change-Id: Ia1fdf9e0ffa401f64ee9a5c130ed10709d930eb7
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:

	src/com/android/settings/cyanogenmod/BootReceiver.java
settings: Enable location mode header switch

Change-Id: I347e769351bc15daa87d3b6d684afe4e80416ecc
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
settings: Add dock battery support

Dock battery patchset chain:
base: http://review.cyanogenmod.org/#/c/55349/
native: http://review.cyanogenmod.org/#/c/55028/
healthd: http://review.cyanogenmod.org/#/c/55029/
settings: http://review.cyanogenmod.org/#/c/55212/
tf700t: http://review.cyanogenmod.org/#/c/55030/

Video (battery styles): https://www.dropbox.com/s/a7dp3glb7lv1zcg/dock_sdcard01.mp4
Screenshots:
 * No dock: https://www.dropbox.com/s/2yvngdaqok32xiz/dock_sdcard01.png?m=
 * No charging: https://www.dropbox.com/s/ezghtgoedei17oj/dock_sdcard02.png?m=
 * Docked no charging: https://www.dropbox.com/s/7fasc05fw5ylfxi/dock_sdcard03.png?m=
 * Docked charging: https://www.dropbox.com/s/x37vrhxzd075f7p/dock_sdcard04.png?m=

Change-Id: I70a84e4a84cae92dbaa9b21d407d39aba974993e
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/status_bar.xml
en_GB translation (localisation)

Change-Id: I19741f48d890abfcc7e6f22a378d049530cf5900
Only show ART information if switching from dalvik to ART

We do not want to confuse users with a big information dialog, if
they change from ART to dalvik as dalvik is still the official
solution, supported and considered safe.

Change-Id: I7590bcd9702ecd9eb402bc2b1ee1c3d67dedd0f2
fixup merge errors