Revert "Revert "[2/2] Settings: Implement App circle sidebar""

This reverts commit 46707979c0bfb7c0979326eded1f3c1dc13b5d61.
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)
(cherry picked from commit a7fa0cb018c9030be96044d97d4754055e53fdd1)
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)
(cherry picked from commit 678e64e7abc80ad4451632a12579162cfb81eab7)
(cherry picked from commit fdc95271d0c6e1fa12e537b9e254f43e09616e8e)
(cherry picked from commit 520678a80666d73c1f5bbb0318820f15ce4c5b76)
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)
(cherry picked from commit 8734f8db169b698321f067ef40e88b0b69582b19)
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

(cherry picked from commit cd1e4e7b900e4271788f039d45f7ec54619e50e1)

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

(cherry picked from commit 0b9df305a89599bb2735d0c32125b754852f97a0)
rename Home

(cherry picked from commit 9223cf0158213febcf070abd6910e2ea36d9158f)
(cherry picked from commit ec94213560bd25feac17dd911ef577f09b253ec7)
(cherry picked from commit aea7c365c4b1785c575546cdcc0164052efe94e5)
(cherry picked from commit 6795910b52fef7a7fea106337ed02724fcb3647d)
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)
(cherry picked from commit 66cd69d5e76f9b0b992ed4d5b97ab142c883bc89)
Fix Phone Info

(cherry picked from commit d970fe370971003c9bcc85cc922a05a63b371b47)
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)
(cherry picked from commit a4db5ffc6e0747637a0183d84e1c439993f0d214)

Conflicts:
	res/values/cm_strings.xml
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)
(cherry picked from commit 03bc96419970711e96052a1ec916ffe0768c516c)
lets make the mod version, report what it really is!

(cherry picked from commit 0b23442d0f8d22a4496421b4a2ba8b43f514cb4d)
(cherry picked from commit e225f7d470afccebfb5a9899ca83278353ace8bb)
(cherry picked from commit 83de6b423f9bddb721f39ecad00bb29c36667e21)
move hw keys

(cherry picked from commit 56c9690eb308310f60bcff09ef1d19667f6fbd7c)

Conflicts:
	res/xml/system_ui_settings.xml
Derp

(cherry picked from commit 041bcd788cdf2c073ff55d084d6f3a43692cee9b)
(cherry picked from commit 52d1f9c0c559f94107c2e54218ebd1cc868b9b40)
(cherry picked from commit f007164fdab547df077ced2f8c09e21dc8037150)
(cherry picked from commit 153a2e82937380257d3ec18c86c107ca096d07a2)
(cherry picked from commit 5cc95835dae6df1a19c3586fa9e9f644882176b7)

Conflicts:
	res/xml/device_info_settings.xml
Revert "Revert "[2/2] Settings: Implement App circle sidebar""

This reverts commit c99b5b3c708576a46b962dabab869b82a7cf4e2b.

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit c1dd697ba51d8122c9737164ea6139be8c726e8b)

Conflicts:
	res/values/cr_strings.xml
Move circle app bar

(cherry picked from commit 0d9b84b7d4830f9f089b72358488241782ffdf25)

Conflicts:
	res/xml/system_ui_settings.xml
Move app circle bar to better location

(cherry picked from commit bf65a4494be83887ea3682626e3bcac0817c2989)

Conflicts:
	res/xml/system_ui_settings.xml
[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)
(cherry picked from commit d53837082eeb95de239a8b6f3483a5981e75963f)
Sort Settings menu