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)
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
updated KitKat 4.4 Rev 1.1

(cherry picked from commit c9f60f68ff68814b78011b4467d85696d4bb3177)
(cherry picked from commit 360700d9e9a4c849a9be4c5540e9e0fd2844b6c9)
(cherry picked from commit f542c8c1ee99b8ac4647a43e9bbb62171f9e9e8f)
(cherry picked from commit ac4d1fede89758a5c1f2097bc5bdf4f391a524c6)
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)
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
add advanced display strings

(cherry picked from commit f3e6bcdd221497ec4a44f1feed4eff830afd2f36)
(cherry picked from commit db684dbecf0650961555642e0000166e9ec12c6b)
(cherry picked from commit d807a53c883c3aedd3d6f8fa73a4f9749020bd38)
upgrade AOSP to 4.4r1.2

(cherry picked from commit e716a2a31d96691033bad3de1c45845c0659e092)
(cherry picked from commit 0397f16656723e24e4b068418b3aabdaa727645e)
rename Global menu to Power menu

(cherry picked from commit 7a19be1fc09772305e9d6550f659114b323054e8)
(cherry picked from commit 8ad3f0605a9fc6b1cc75dc7b0420736616985d45)
rearrange settings

(cherry picked from commit 45bab5b012a59e552410654d2b794ea60b7eeffa)

Conflicts:
	res/xml/settings_headers.xml
remove halo double