[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)
(cherry picked from commit 846145158970ddef156e52348b1dc927249210b6)
(cherry picked from commit 2e865fcdde61a64d1427f12c515991c0b554979d)
Revert "CM PlatLogo: CyanogenMod version preference (2/2)"

This reverts commit c760a03f5929495ddb63723761950e12fe94858c.

(cherry picked from commit 03714f23741e8cf6f0af507ca6184a84cf6e1131)
(cherry picked from commit bdbdbd3473d3fe99d18406cc0cd27c997f4fa27e)
(cherry picked from commit 8005783f7d38a2145352d77c38c9abb57d47be88)
(cherry picked from commit 94daba87d2a142cb5aac9828e013487c15ccec1d)
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)
(cherry picked from commit 0b147d69e5b6f656530d8133c4937f42eae4ccda)
(cherry picked from commit df3bd3e9f2a6cdb837f20b5b7ea5d857cb3cb33a)
Add AOSP version 2

(cherry picked from commit d13ba7ebb990312f06bb23c65738c94c76ebdcfa)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 0c3acbaaeabdd1a890758e0669265b01ec9ea3bd)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit a5efc4cde54593af6bf35562752edf4df4f0728a)

Conflicts:
	res/values/cr_strings.xml
rename Dark UI

(cherry picked from commit 83e8e8f02e5ad358c08ab77247c786376065685a)
(cherry picked from commit 2d7de40102594ba3f68e73984917062094acee04)
(cherry picked from commit f9e30bc298b093133d373e9e88e9c7a090841a0c)

Conflicts:
	res/values/cr_strings.xml
rename Home

(cherry picked from commit 9223cf0158213febcf070abd6910e2ea36d9158f)
(cherry picked from commit ec94213560bd25feac17dd911ef577f09b253ec7)
(cherry picked from commit aea7c365c4b1785c575546cdcc0164052efe94e5)
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)
(cherry picked from commit 44a5f7ff4bf428c91c42840df4ccd3f3cd6ce336)
(cherry picked from commit 11bce16ea4700fea96640a3e6b9d0768d67a386c)
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)
(cherry picked from commit 1c4fe7cf3e31c63be1dca6dcf1851795cf3e380a)
(cherry picked from commit b94b84c278c27257d6875d7e5cff6f13ab3fac5e)
update ART warning message

(cherry picked from commit d7ca050ed18f2ee9850b09325888bef66e884a6f)
(cherry picked from commit 0cf650fe8b11e401fab6068ebbd610574dbdbab0)
(cherry picked from commit 3a36968e0fcfdd01492f91b06c7ecc5c3bb46862)
(cherry picked from commit d61a191343679261d765ce27bbe3cfdcbebe4339)
(cherry picked from commit 5184821860b8c39fb730f83c85e076b92ffa18db)
Add build id to AOSP rev

(cherry picked from commit bc28464e36f959f33ccf796561a8901d0c68bb09)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit f1bbaf26c9e86ea976c7638565a5fbe91316355c)
(cherry picked from commit a53990cab1f04d5dedcad19d0c1e7e469cbdc9a3)
(cherry picked from commit f08eff19efdc2995f02e0ef7211142424e006442)
lets make the mod version, report what it really is!

(cherry picked from commit 0b23442d0f8d22a4496421b4a2ba8b43f514cb4d)
(cherry picked from commit e225f7d470afccebfb5a9899ca83278353ace8bb)
remove duplicate button liughts

(cherry picked from commit c5a61da88f5b9e7d73eb7d56e485e53f270e647b)
Derp

(cherry picked from commit 8d7ebb6aca7640d68892e916cae192dd1f3e6777)
derp2

(cherry picked from commit e0070b3c9cbc5a10df2527ac756dc822cc8f257d)
rename dark ui