Merge commit '203688c6579bc530288642972d1f872a12516dfe' into HEAD

* commit '203688c6579bc530288642972d1f872a12516dfe':
  Fix dump of the persistent drawing cache attribute.
Merge commit '863f22d0451d52cbcccc252ad29858ef1578e709' into HEAD

* commit '863f22d0451d52cbcccc252ad29858ef1578e709':
  Fix 2673731: Added password history

Conflicts:
	core/java/com/android/internal/widget/LockPatternUtils.java
Merge (-sours) commit '8b70c9c1db121d38c9664af77a8aa830820b4983' into HEAD

* commit '8b70c9c1db121d38c9664af77a8aa830820b4983':
  Pick the default IME in case of a fresh install.
Merge commit '0c677318b54581d488ac6510b6b68e7772d7ab5a' into HEAD

* commit '0c677318b54581d488ac6510b6b68e7772d7ab5a':
  Add missing bindProgramRaster to scriptC_lib.
Merge commit 'f47d7405bbcb25d7cdf89ebb059f41520fe9ab87' into HEAD

* commit 'f47d7405bbcb25d7cdf89ebb059f41520fe9ab87':
  Modify Canvas drawText to run bidi and shape.
Merge (-sours) commit 'c8f503b5285e30c1a881d0ba860ba9021f57d113' into HEAD

* commit 'c8f503b5285e30c1a881d0ba860ba9021f57d113':
  Moving junit out of core.jar and into core-junit.jar.
Merge commit '33b974393b6fadcefc896ec4a0f9b66724f61e9f' into HEAD

* commit '33b974393b6fadcefc896ec4a0f9b66724f61e9f':
  ActionBar added to framework, integrated with Activity and styles. Added onClick attribute support to menus in MenuInflater.

Conflicts:
	api/current.xml
	core/java/android/app/Activity.java
	core/res/res/values/styles.xml
	core/res/res/values/themes.xml
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
Merge commit 'dfd550d44c02e8a7a6bfeba28b60ae4c4132d3fc' into HEAD

* commit 'dfd550d44c02e8a7a6bfeba28b60ae4c4132d3fc':
  Add @hide tag to fix SDK build
Merge commit 'f27d7fbac8f36ab5e10c8a5e03bad341aa826ea3' into HEAD

* commit 'f27d7fbac8f36ab5e10c8a5e03bad341aa826ea3':
  Adds excessive-comma-usage.html to DumpRenderTree skipped list as it causes OOM
Merge commit '56118b5b385adad0ff301f67be2cf601432d94ba' into HEAD

* commit '56118b5b385adad0ff301f67be2cf601432d94ba':
  Checkpoint work on MTP and PTP investigation.
Merge commit '18ff7b4c37d9cd230687269d8b65330d9b78db4a' into HEAD

* commit '18ff7b4c37d9cd230687269d8b65330d9b78db4a':
  Exclude mtptest program from simulator builds.
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