fix lockscreen style crash
	modified:   src/com/android/settings/liquid/LockscreenStyle.java
Revert "Revamp halo options layout/new drawables"

This reverts commit e36dd6e0a5d35f30038b8d7366c94aa95b409b21.

Conflicts:
	res/values/liquid_arrays.xml
	res/values/liquid_strings.xml
	res/xml/halo_options.xml
Settings: Quick Access Ribbon (Part 2 of 2)
This patchset removes power widgets and replaces it with
a smaller version of the quick settings panel.

Credit: Danesh (CM)
Revert "Apparently liquid derps too lol"

This reverts commit c3f83fa553126013196d90c7395a81dca470151e.
Revert "Fix lock screen wallpaper and custom lock handle"

This reverts commit 7df1faf6cc88639381c08b2a97f56d3f58ff57b2.
Revert "Lockscreen wallpaper: show error if cropping not supported"

This reverts commit 2376b4cb561f7ba7c6bd469c3aeededf4aef8b60.

Conflicts:
	src/com/android/settings/liquid/LockscreenStyle.java
Revert "Custom wallpaper: use PNG"

This reverts commit ef5f082a7da6ff3a148584a25dba9d640cc42fc3.
Revert "Custom lockscreen wallpaper [2/2]"

This reverts commit fe7de1547b00eabc283aa40719abbc32b9e7dfe3.

Conflicts:
	res/values/liquid_strings.xml
	src/com/android/settings/liquid/LockscreenStyle.java
Custom lockscreen wallpaper [2/2]

Based on commit of ParanoidAndroid on android 4.3

Lockscreen wallpaper: show error if cropping not supported

Custom wallpaper: use PNG

Conflicts:
	res/values/pa_strings.xml
	res/xml/additional_settings.xml
	src/com/android/settings/AOSPAL/AdditionalSettings.java
	src/com/android/settings/SecuritySettings.java
Add missing ribbon linked mode strings
Move ls wallpaper and fix qs ribbons
Remove leftover navbar left handed mode stuff
Revert "Default charging animation to none by default"

This reverts commit d79bc7d89cd6c3324cf89d693dc4e32d5d2577db.
Shorten contextual notification panel header strings
More liquid string ocd changes lol
Fix ribbon strings and ribbon tile preference
A little bit more of liquid string ocd
Settings: Fix the memory leak in Settings

Fixed the memory leak in both InstalledAppDetails

Change-Id: I3520b3c1fe1bf98e3baec2ee989eb215164a7cf2
Signed-off-by: Zhijun Peng <pengzhj@marvell.com>
Theme Data Chart White :D
Statusbar clock font style + more fonts (2/2)

A combination commit of

https://github.com/CarbonDev/android_packages_apps_CarbonFibers/commit/994fabdb0cda3c6d79b99b80df494b96e674c342
https://github.com/CarbonDev/android_packages_apps_CarbonFibers/commit/b632e368d4070d7a701a66528edf7dd175c9cc46
https://github.com/CarbonDev/android_packages_apps_CarbonFibers/commit/b35c1cfcfe4f10f3795fa8b4a45bf0b04527212a
https://github.com/CarbonDev/android_packages_apps_CarbonFibers/commit/b9b2156221b71ca469f2552c51239c19d095bb53

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml