Merge commit '8d9db8e4c774bb75bc8c08cc5309a7c0712ce017' into HEAD

* commit '8d9db8e4c774bb75bc8c08cc5309a7c0712ce017':
  Added getNumColumns function to GridView.java.

Conflicts:
	api/current.xml
Merge commit '54db59c3594e887a412a24713fc3daa1c2404593' into HEAD

* commit '54db59c3594e887a412a24713fc3daa1c2404593':
  Rename ProgramFragmentStore to ProgramStore.
Merge commit '7cd51efcbd2d083bf577696591ef1769034f7e2f' into HEAD

* commit '7cd51efcbd2d083bf577696591ef1769034f7e2f':
  Remove the deprecated cursor methods.

Conflicts:
	core/java/android/database/sqlite/SQLiteCursor.java
Merge commit 'e26867793b6a0c226e02f7da880b06efbcb8707e' into HEAD

* commit 'e26867793b6a0c226e02f7da880b06efbcb8707e':
  Remove the unused modification APIs from MockCursor. They shouldn't have been public in the first place.

Conflicts:
	api/9.xml
	api/current.xml
Merge commit 'c1d8651538cf01881c42d638c836ff6405037ffe' into HEAD

* commit 'c1d8651538cf01881c42d638c836ff6405037ffe':
  Change the default JS engine for Android-specific layout test results in DRT from JSC to V8
Moved the DOWNLOAD_CACHE to /sdcard/.cache
 (Or whatever is exported in init.rc)

Don't use DOWNLOAD_CACHE variable as this is specified sometimes in
boot images that we are unable to change, use EXTERNAL_STORAGE
instead, I understand this may cause a problem if there is none
specified, however most of the time this will not be a problem.
Reverted because it breaks LED notifications.
In particular, those which are received when the screen is on such as missed calls.

The logic doesn't make sense. Instead of using mLedNotification == null to disable the notification, it is using !mPendingPulseNotification, but if the screen is on at any point mPendingPulseNotification is set to false, which disables the notification before it has even happened.
Whatever they were trying to do by writing this code, it doesn't work!

Revert "Only pulse notification light if a new notification has been received since the screen was last turned off"

This reverts commit 2117f6fa3880e55e6a90fbd8b3a12d469c9b738b.
ProcessStats.java: Fix for bootloops.
mBuffer size was too small causing the CPU frequency array to be truncated causing exceptions and then the bootloop issue.
MAX_SPEEDS was too small, due to the additional overclocking steps.

http://code.google.com/p/oxygen-rom/issues/detail?id=507
NotificationManager/KeyguardUpdateMonitor: Charging behaviour
Only turn LED green when battery is actually fully charged, not at 90%
Also, don't display 'charged' on the lockscreen until the battery is fully charged
automatic backlight: Allow level decrease and increase
activitymanager: fix for onstartcommand
onstartcommand is not being called with a null intent, which causes services not to be restarted, in particular the EAS service.
http://groups.google.com/group/android-developers/msg/0968c394999f2967
Should resolve issue 741 providing it doesn't cause any regressions.
audiosystem: Alter audio routing policy
This will work around 2 issues.
1) the stream pause whilst media is playing.
2) the strange camera crashing behaviour when a headset is plugged in. Issue 709.
I don't think this will break anything or alter the behaviour of anything else.
NotificationManager: Don't play notification if in call
Fix for issue 779
Fix for what seems to be a typo responsible for some cases of issue 2207
(http://code.google.com/p/android/issues/detail?id=2207)

Change-Id: I61503990035718fef98e61f020fc7799e848424c
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.

Change-Id: I47b0f17327f906055e1d358226b5db0ddfb2241f
Reduce Call Answer Delay

This patch sets a boolean acceptingIncomingCall to true on
acceptCall.  In setAudioMode, we set the mode as IN_CALL if the call is
ringing and acceptingIncomingCall is true.  This initializes the
microphone sooner, and should reduce the microphone delay.

Not sure if this is the best way to do this, but this reduces call
delay to under a second for me.  I thought I might as well upload it so
others could have a look at it.

Change-Id: Ied21acb81c8447fc9949cecf861c0be4ca67ebb0
aapt: Allow raw "%" in unformatted string-arrays

Commit 15fe2cb added format checking for translatable strings, enforcing
the use of positional args.  This check can be disabled on <string>
values with translatable="false" or formatted="false".  But they didn't
check for those attributes on <string-array>, so some of CM's strings
fail when they're not really format strings, just because they contain
percent signs.  (e.g. brightness widget's "Auto/Dim/40%/100%")

So now the formatted/translatable attributes are checked in string-array
too, and we can restore our proper percent signs.

Change-Id: I88df7b9ae38760be202d9d75e68f707abdbf3d95
PackageManager: Restrict system packages to protected storage

Don't allow packages signed with the platform key to be
installed into user (or app) controlled storage

Change-Id: I4dff8a33a9be7e1877812cf821bf6148e03e7bab
use new libreboot method of rebooting

relevant change here: http://review.cyanogenmod.com/6128

Change-Id: Ide576ee90c3488b31785799dc873edb200f1ad9e
surfaceflinger: allow targets to override the electronbeam duration

The Electron beam animation is constrained by the framerate the device
can achieve on GL. On adreno200, and even 205, the original 24 frames
resulted in a fairly smooth animation; on Tegra2, the animation is just
too fast.
From experimentation, I'd say the total number of frames should never be
less than half the attainable framerate (i.e., a half-second animation).

To use this, set TARGET_ELECTRONBEAM_FRAMES to half the desired value
(the default is 12 for a 24-frame animation)

Change-Id: I875b74ee3969ba0c8d38c234f7cb0f4402581ffb