I changed something?
Remove CMUpdate preference screen
surfaceflinger: Improve dithering method (2/2)

Some devices have blur effect while opening apps.
This fix adds an option(2) for "Fix blur effect".
Dithering is always enabled when persist.sys.use_dithering=2

Conflicts:
	res/xml/performance_settings.xml
	src/com/android/settings/cyanogenmod/PerformanceSettings.java
Revert "surfaceflinger: Improve dithering method (2/2)"

This reverts commit f3165a68682a4c8fe7f1d5af8116e2d25dc75f72.
Revert "Revert "surfaceflinger: Improve dithering method (2/2)""

This reverts commit a51ae8230beee710460171ebdfb8aec6a767cff6.

I know compilation's gonna be... anyways :|
add option to display navbar (1/2)
status bar - center clock (2/2)
option to change status bar transparency (1/2)
New PyroMod optimization

Conflicts:

	res/drawable-hdpi/ic_cm_stats_notif.png
	res/drawable-mdpi/ic_cm_stats_notif.png
	res/drawable-xhdpi/ic_cm_stats_notif.png

Conflicts:
	res/drawable-hdpi/ic_cm_stats_notif.png
	res/drawable-mdpi/ic_cm_stats_notif.png
	res/drawable-xhdpi/ic_cm_stats_notif.png
Screenshot settings - settings/system/power-off menu (2/2)
Circle battery (2/2)
Don't odex Settings
Move HW Rendering app to System/Performance section

Allows controlling of HW rendering individually for any application.
This is usefull for applications having the "blank white screen"
bug (gmail, facebook, ...). Turning off HW rendering for these application
eliminates the white screen bug. As a side effect, the application UI
will become more laggy - feels like in gingerbread.

Conflicts:
	src/com/android/settings/cyanogenmod/PerformanceSettings.java
Respect the privacy of ics-plus users

Change-Id: I0b8f92f9a1a04243d2f2ba598ae7ea0f60bf426d

Conflicts:
	src/com/android/settings/cmstats/ReportingService.java
	src/com/android/settings/cmstats/Utilities.java
CMStats changes. (gonna revert!)

Remove the notification on boot. Users are thinking they need to opt out to get rid of the notification.
The setting to opt-out still exists in the Settings app.
If the user does not opt out within 'tFrame' time (1 day), the checkin service will now run; prior
to this, the checkin service would not run until the next reboot. That next reboot could occur within a
few minutes (startup crash, which then automatically checks in before the user has a chance to opt out)
or even the possibility of never. This is unpredictable and buggy.
Change the checkin frequency from 7 days to 1 day.

Change-Id: I66a26a6c200710146c0de3832253417fae557e52

Conflicts:
	src/com/android/settings/cmstats/ReportingService.java
Revert "CMStats changes. (gonna revert!)"

This reverts commit 817d7133d9bd31f392f321456e7c02ef7a02468e.
Revert "Remove CMUpdate preference screen"

This reverts commit 536eeee99da23d33af6d7317159ff6d3e52c5845.
Fix cherry-pick

or at-least try...
Add Google Analytics support.

Change-Id: I81f816f2a358a36247c05a97053e948f4ea62753

Conflicts:
	Android.mk

Conflicts:
	src/com/android/settings/cmstats/ReportingService.java
Revert "Add Google Analytics support."

This reverts commit 642d9e2677d5efa9bce99dbafd1931264c9289aa.