Add AOSP version
(cherry picked from commit 963cb165c77d3c084e0e11812187c336898f660c)

(cherry picked from commit 44987456bcf7eb8187184a08456c50d942ba8d0a)
(cherry picked from commit ec6a8031c6115a4f2c18625caf03fdebc4adc7ee)
(cherry picked from commit 431222ca640a22ba1101eb6c63413ed751e124b1)
(cherry picked from commit bc1d912cd31f40b724d851438160e012737150e6)
(cherry picked from commit d8d8958e51c6a990b3bd1d52e3884cbfc9ad41e8)
(cherry picked from commit d83c61131051f47e5ecac4f1c288022669edec63)
(cherry picked from commit 78ef55f03bb6a5118ecc6844579cec76872ebb04)
Add AOSP version 2

(cherry picked from commit 7ca6927d6f1a876123c8ec31a53cd65788f105c5)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 4af4a3934f0277a3dabeca83e6cf17890a7a2c26)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 83a96cd06be51558c5dda0c15c3c71c8ed7e796f)
(cherry picked from commit 52ed3fed5e45ca41e6b936f14904beee41bf74cf)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 58054b2e4806277e01c08e66f765136f1374b980)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 8d8413698b6c81ebea6d6a90f3a82121117a5eba)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 3275b34932f2f2698447e7e0b44e8e4ab42f92db)

Conflicts:
	res/values/cr_strings.xml
Merge "Theme: Make About phone > Status UI colors consistent" into android-4.4
(cherry picked from commit 70788b13a18096c1198800542d39d8648610b6ae)

(cherry picked from commit 369a2669714f07cedcfa80ee21f28d496ed9a53f)
(cherry picked from commit 5da37e92ef721cee657aafd8f664d150b9192818)
(cherry picked from commit 785bab40d9b19521f9e7b22585f89a0fbdcae14c)
(cherry picked from commit df4cb64b19422e89850a8c081617bdb72474e8a9)
(cherry picked from commit 5f91f5c62b2e52f7a00cfd837ed11254429e809a)
(cherry picked from commit f65cdfc75ad9e95fcab70f13e1786fa7c51df8d9)
Settings: add Advanced Settings under Display

For use in TV-Out settings and mDNIe

Change-Id: Ib595b81a11e19f8526e532400e57f5771db09499

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

(cherry picked from commit 3684b97a19b40f4ffd9664573ba0a5a253da48aa)
(cherry picked from commit 56c406a5ba1dc48f450b3a4fecbb5660963a399a)
(cherry picked from commit 3b36cb316c7fadafca5d25a08b3465478b8a1520)
(cherry picked from commit 4575c3fa873664f07c88b4e6d5fb647ea564ea15)

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

(cherry picked from commit e890a6bab82fa53c035c56bbffa56a79bb009b9c)
(cherry picked from commit 409fc5a5c625f9920e2d7e57335154f558ffc58b)

Conflicts:
	res/xml/display_settings.xml
add advanced display strings

(cherry picked from commit f3e6bcdd221497ec4a44f1feed4eff830afd2f36)
(cherry picked from commit db684dbecf0650961555642e0000166e9ec12c6b)
(cherry picked from commit d807a53c883c3aedd3d6f8fa73a4f9749020bd38)
(cherry picked from commit f8ea2a64d90340fbc6d1a9ad88c6cae2c1354a80)
(cherry picked from commit 88bc5e636c663be3de91d6898962d3220225b923)
rename Global menu to Power menu

(cherry picked from commit 7a19be1fc09772305e9d6550f659114b323054e8)
(cherry picked from commit 8ad3f0605a9fc6b1cc75dc7b0420736616985d45)
(cherry picked from commit b675b747bf352844a41a5c67ec39ec51e2e976e8)
(cherry picked from commit f3bc25aa2807d7c960872c9c8871f86708058da0)
rearrange menu

(cherry picked from commit 124273db834760981516adc6ff5b43dae37ecf74)

Conflicts:
	res/xml/settings_headers.xml
rename back to Lock screen

(cherry picked from commit 2f8b0eba756bc1a1324885a383fc77d3dc517588)

Conflicts:
	res/values/cr_strings.xml
rename Home and TRDS

(cherry picked from commit 58153ebea60d70bdcf75317feedd1e7761df6bff)
rename home 2

(cherry picked from commit dc9c0abb0de22f7714d15888832edcad48b0c074)
updated settings names

(cherry picked from commit 8ad665ad366a6b35962145fb984e64a897e291b6)

Conflicts:
	res/values/cr_strings.xml
Derp

(cherry picked from commit 2e8fa1fcb09fdae8961af5a1dead6897b18d42d7)

Conflicts:
	res/values/cr_strings.xml
updated settings names 2

(cherry picked from commit 96536734d40804fc415022c4b0ccc4e69032a8bf)
move Active Display to Lock Screen

(cherry picked from commit ad79ae92cf0a495e9b16a8dbd577754ca5a3c722)
Revert "[1/2] Settings: HALO"

This reverts commit fc005e0eb59c11176586f74d4f05deb902cc7574.

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	res/xml/halo_settings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/temasek/Halo.java

(cherry picked from commit a073fb1fd78afb44ab0e76fb9bc204728f7ec334)

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
[1/2] Settings: HALO

Forward port from jb43.

PS1: Initial port
PS2: Fix conflicts with notification LED
PS3: FIx derp in strings
PS4: Fix derp in pa_arrays (tag not closed)
PS5: HALO Mods
PS6: Update pa_arrays & pa_strings
PS7: derp: rmv pesky file backups

Change-Id: I7de6a9157415fe05b0a59d8260e33cc1527a342d

Conflicts:
	AndroidManifest.xml
	res/layout/installed_app_details.xml
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/applications/InstalledAppDetails.java

(cherry picked from commit 59601ec04d5bd74e4550354010fc38a87b6aaf20)

Conflicts:
	AndroidManifest.xml
derp /string-array

(cherry picked from commit 41265b06e67f6f5bfdcaa0ed115a5c85d092c96c)
derped
(cherry picked from commit afd06817cc09f94552ab1ee487be2cb499c58c8d)
HALO Derp

(cherry picked from commit 726eecc6772e6c2e7343ff36f27ccf2f9db4fc4e)
Derp

(cherry picked from commit bc0f7d47477af082e3e2041e7ee4ab7402e8a778)

Conflicts:
	src/com/android/settings/SecuritySettings.java