Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" into gingerbread
Merge "Fix for PduParser.java, allows mms recieve on supersonic" into gingerbread
libstagefright: Add support for NV12tile color conversion to software renderer

-Software Renderer is used to display last buffer on resume.
-Since it does not support NV12 tile color format it results in a crash.
-Add support for NV12 tile color Conversion to 16bit RGB565 to software renderer.

Change-Id: I3c8b0a06e7bd1ada7c1a52ee77d2a1f46b55a7b8
Merge "Always show the mouse pointer when there are mouse events" into gingerbread
Revert "Revert forced WAL mode for SQLite databases."

This reverts commit f81ec953652acd7ed0ba92d4ca2d7563f07d4b29.
Revert "Don't bail if we can't set WAL mode on an SQLite database"

This reverts commit b00dcebfd7db952f41a9ab3be9c7fbea0dc0187a.
frameworks/base:
Add check for READ ONLY databases (WAL can be used with R/W DBs only).

CRs-Fixed: 278062

Change-Id: Iadcbd868c1ef47e75bbdf5343868e542353ac9f2
frameworks/base: Use WAL mode for selected databases. Others use default mode: DELETE.

Change-Id: I4cb3c87a751f83bf47a73c4652ce1d8bf64a60fd
Revert "Revert "modify the device to enable to get the state as slide-open/slide-close.""

This reverts commit 7cc414c564c8365f2d3190dc6d9456aa4e5a6ba3.
Make compact carrier label single line

Fixes this: http://puu.sh/24fI

Change-Id: Idc6d922d6333195e232a9991099df072523df60c
libstagefright: allow OMX.TI.Video.Decoder to decode 854x480 MPEG-4 AVC

Change-Id: I147623ccd512b79f93ad1733f87efaa6611eaf7f
Merge fix for PduParser.java - Part 1

It looks like there was a merge issue in PduParser.java that duplicated
some code when the gingerbread code was merged.  The change in
gingerbread essentially put the entire PduPart.P_CONTENT_DISPOSITION in
an if statement, and set it to positive for all devices.

This fixes MMS problems on the Nexus One, and possibly other phones.
The second part reverts the config.xml change on supersonic, as it
should now work with the default code.

Change-Id: I47b0f17327f906055e1d358226b5db0ddfb2241f
Attempts to fix apps that reload when closed using long press back.

Eg, open gallery and try to force close using long press back.

Change-Id: I923fa8ca582ca554d7096c917fb6aeb12db3b899
camera: Only change 720p preview dimensions for old userspace

Change-Id: I0577a0e9579303ae840585775b1861354f9aceba
Merge "Make compact carrier label single line" into gingerbread
Merge "Attempts to fix apps that reload when closed using long press back." into gingerbread
AM/PM Styles in Status Bar

Adds configurable AM/PM styles back into the status bar.
Includes Eclair's "Normal" style, Froyo's "Small" text, and Gingerbread's "None".
CMParts Portion: http://review.cyanogenmod.com/#change,4298

Relevant link: http://en.wikipedia.org/wiki/Midnight_sun

Change-Id: Ia365b5fedbc67d84e3aaed4d6ae280336d4f5bb6
Fix for WiMax always on at boot - wimaxbutton fix

This fix saves the state of wimax to
the setting WIMAX_ON when using the wimaxbutton
powerwidget in the statusbar to enable/disable wimax.

Change-Id: I9691387462678e2c49f756744f91f69c682c5e77
Merge "Fix for WiMax always on at boot - wimaxbutton fix" into gingerbread
Merge "Adds Persian(Iran) and Urdu(Pakistan) locales" into gingerbread