replaced temasek lock icon
Revert "CM PlatLogo: CyanogenMod version preference (2/2)"

This reverts commit c760a03f5929495ddb63723761950e12fe94858c.

(cherry picked from commit 03714f23741e8cf6f0af507ca6184a84cf6e1131)
(cherry picked from commit bdbdbd3473d3fe99d18406cc0cd27c997f4fa27e)
Revert "Add CM Legal (2 of 2)"

This reverts commit 329dbbce5455f837493258a08d10feaa0ae9a3e8.

Conflicts:
	res/values/cm_strings.xml

(cherry picked from commit f741bab11f6cd2d9d44473804aa4b3b545fb6ad9)

Conflicts:
	res/values/cm_strings.xml

(cherry picked from commit d9073b44d598cbf8c11661e16116dbeeea5ba73a)
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)
(cherry picked from commit 48260ff7ae2f51f7d61b96562415b781194cd30c)
(cherry picked from commit a5b9b834210e7065eff1845805b3582be58603fe)
(cherry picked from commit 09ebd5eef0b09eb0ffad20a43021a3e035af3aba)
(cherry picked from commit cfdc5308da58013e2329bd9eb187408b81cbd28c)
(cherry picked from commit 9206e3e2a1a0ca5d05e52893586bf4a965961d50)
(cherry picked from commit 264197886e7a525b7110e424530012857a2bf17e)
Add AOSP version 2

(cherry picked from commit d13ba7ebb990312f06bb23c65738c94c76ebdcfa)

Conflicts:
	res/values/cr_strings.xml
Reordered Settings Menu

(cherry picked from commit 15c9bbab063adfc017ccedcf67f670beb6e88538)
rename Dark UI

(cherry picked from commit 83e8e8f02e5ad358c08ab77247c786376065685a)
rename Home

(cherry picked from commit 9223cf0158213febcf070abd6910e2ea36d9158f)
Add UB logo to about info screen

(cherry picked from commit 660bbec813749b1ae73975811ab94f75a9a2ce90)

Conflicts:
	res/xml/device_info_settings.xml

(cherry picked from commit 59ecc16358ba77dc265ed0684681c2a18de2a096)
(cherry picked from commit 096ac0134c8009ea98629f3e174b4c362b7c8914)
Phone Info Fix

(cherry picked from commit b3a3721c950ff28f5c26972d8fffcf5a0ac5c31e)

Conflicts:
	res/values/cm_strings.xml

(cherry picked from commit ede41d8258b7ca9909f0eeacb0b10e3080b6a5b6)

Conflicts:
	res/values/cm_strings.xml

(cherry picked from commit 8c2420a5e5e3c08dc269cc6b51ad066daca54497)
edit some widget titles

(cherry picked from commit e2236ba9474a7edefcefd171999a3ea2911b15ed)

Conflicts:
	res/values/cm_strings.xml

(cherry picked from commit eb0e0611d9fddf9ba2c3a13d7a6eb4d8bcdaec2a)

Conflicts:
	res/values/cm_strings.xml

(cherry picked from commit 8c3a6a542f93d72ee89a8073c5aaa0d4776a60a4)
update ART warning message

(cherry picked from commit d7ca050ed18f2ee9850b09325888bef66e884a6f)
(cherry picked from commit 0cf650fe8b11e401fab6068ebbd610574dbdbab0)
(cherry picked from commit 3a36968e0fcfdd01492f91b06c7ecc5c3bb46862)
Derp

(cherry picked from commit 041bcd788cdf2c073ff55d084d6f3a43692cee9b)
(cherry picked from commit 52d1f9c0c559f94107c2e54218ebd1cc868b9b40)
Add build id to AOSP rev

(cherry picked from commit bc28464e36f959f33ccf796561a8901d0c68bb09)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit f1bbaf26c9e86ea976c7638565a5fbe91316355c)
[3/3] Settings: Add NFC polling setting

Change-Id: I1f715d9ab6b77cf4903e2bf5ef8310471c178309

Conflicts:
	res/values/custom_arrays.xml
	res/values/custom_strings.xml

(cherry picked from commit a9b458d8ece6496f80a94ae3adf4781298e51ae0)

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

(cherry picked from commit 2924fdb1218923f60f8184affe84cba960303377)

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

(cherry picked from commit 39b39167fe4d3b739d06b07c730cd5cf399ec736)
lets make the mod version, report what it really is!