Revert "Revert "settings: Add xxhdpi profile icon""

This reverts commit a97c4b862d5331df2252df50df9931a8574650c0.

Change-Id: I23473bf86dec09bf4d4a26287f911f25f5c21668
(cherry picked from commit ccabdf476ec522277ef50e3646ed5b22a049f002)
New setting under "Debug settings" that enables the development shortcut

Resolve Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/DevelopmentSettings.java

Change-Id: I9a43e611911f2e278605715f714860ad11236fd9
(cherry picked from commit d4340974fe0e3c83d45d7041461ece1555facb13)

Conflicts:
	src/com/android/settings/DevelopmentSettings.java
Fix the build

This shouldn't be there in the first place
It's a result of a failed rebase

Change-Id: I48610dfc4214a096b1c4af61af59bf52c5e50529
(cherry picked from commit 6baad561ab7e180ace17e2c340a85d48986eaeb6)
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
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)
(cherry picked from commit c6a798d0c484a6f97495914517a2aba4f3f529bf)
(cherry picked from commit 6e352d7b07ff7b9a2dd926e931f53c4281b801ac)
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)
upgrade AOSP to 4.4r1.2

(cherry picked from commit e716a2a31d96691033bad3de1c45845c0659e092)
(cherry picked from commit 0397f16656723e24e4b068418b3aabdaa727645e)
(cherry picked from commit a3a3553e1346752d9225ed9f3ed7779b4838f893)
(cherry picked from commit efd2558168122cc93975878bf92708048427e764)
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
remove slim strings

(cherry picked from commit 870b42503d705f1071a12a0c65ce554190023aa6)

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)
Derp

(cherry picked from commit 2e8fa1fcb09fdae8961af5a1dead6897b18d42d7)
updated settings names 2

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

(cherry picked from commit ad79ae92cf0a495e9b16a8dbd577754ca5a3c722)
Updated AOSP to 4.4.1 Rev 1