Merge commit 'a98cb2632dcf07ebd8d036f61c1438f795e262cc' into HEAD

* commit 'a98cb2632dcf07ebd8d036f61c1438f795e262cc':
  for memory databases, don't set journal_mode and don't allow WAL
Merge (-sours) commit 'f49922ed4943c340b1db766230e3f6afdd5b0e5a' into HEAD

* commit 'f49922ed4943c340b1db766230e3f6afdd5b0e5a':
  fix broken current.xml
Merge commit '7c1f4c38a2d3a972f7dc6f508d3318c11ec539c7' into HEAD

* commit '7c1f4c38a2d3a972f7dc6f508d3318c11ec539c7':
  Re-enable optimization for detecting nop state changes in fragment and vertex programs.
Merge commit '0ebd5690b8a9eb55dc940b670267c11600cf7380' into HEAD

* commit '0ebd5690b8a9eb55dc940b670267c11600cf7380':
  Fix 32&24 ->16 bit bitmap uploads.
Merge commit '8d1110383d4437eeebae337026cd91449e4e55a5' into HEAD

* commit '8d1110383d4437eeebae337026cd91449e4e55a5':
  if attach database sql statement is exec'ed, disable write WAL
Merge commit '24ca4545f3fa9ffaf0a84af11f1ab74cd14d232e' into HEAD

* commit '24ca4545f3fa9ffaf0a84af11f1ab74cd14d232e':
  Check for spanned before computing tab stops
Merge commit '1218fcec0701d22124cdb6a975e399ad9820b7c8' into HEAD

* commit '1218fcec0701d22124cdb6a975e399ad9820b7c8':
  Adds a Geolocation permission handler to the WebRuntime
Merge commit '03f0292744094ec107ffce71301c394503a31ded' into HEAD

* commit '03f0292744094ec107ffce71301c394503a31ded':
  New XmlDocumentProvider class.

Conflicts:
	api/current.xml
Merge commit '1ba38b600e181168c8897220048027a164c68b10' into HEAD

* commit '1ba38b600e181168c8897220048027a164c68b10':
  Fix 2655246 file descriptor leak when accessing thumbnails http://b/2655246

Conflicts:
	core/java/android/provider/MediaStore.java
Merge commit 'bb9524b6bdddc7ac77d8628daa8b366b8a7be4a4' into HEAD

* commit 'bb9524b6bdddc7ac77d8628daa8b366b8a7be4a4':
  Add implementations for clipRect(), save() and restore().
Merge commit 'be1304f0c2c96be1876c2bd38d319f46e135536f' into HEAD

* commit 'be1304f0c2c96be1876c2bd38d319f46e135536f':
  Tweak fix for setXSSAuditorEnabled in LayoutTestController.
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
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