Merge commit '3255823de062e981f7bfc7994919207988697e45' into HEAD

* commit '3255823de062e981f7bfc7994919207988697e45':
  Fix 2673731: Adding support for password history to Device Admin.

Conflicts:
	api/current.xml
Merge commit '4d8ae85b5de8a90a597e4b649c6ee7208e446e3b' into HEAD

* commit '4d8ae85b5de8a90a597e4b649c6ee7208e446e3b':
  Add needsOtaServiceProvisioning to Phone.

Conflicts:
	core/java/android/accounts/AccountManagerService.java
Merge commit '75be797b0c07910715f1b2617b58af5abbfd0a99' into HEAD

* commit '75be797b0c07910715f1b2617b58af5abbfd0a99':
  Merge WebKit at r59636: Added appcache/fallback.html to the ignore list.
  Merge WebKit at r59636: Update UA string
Merge commit '4f92fffc71224ad8edcd2d1d3e8037e5e28b2896' into HEAD

* commit '4f92fffc71224ad8edcd2d1d3e8037e5e28b2896':
  MTP: adjust ptptest app for changes in libusbhost API.
Merge (-sours) commit 'eb51f3e340d3ddc935367c302167d4b4b706e904' into HEAD

* commit 'eb51f3e340d3ddc935367c302167d4b4b706e904':
  Check for null before using Layout.
Merge commit '584f137c19d4f4980537b51a8b864d0d97ffd0a0' into HEAD

* commit '584f137c19d4f4980537b51a8b864d0d97ffd0a0':
  Allow root to set the mount state as well, so that the simulator can use the fake sd card.
Merge (-sours) commit 'cc9c4242e3f77c20a943bdbc5fde5fe28cc2def6' into HEAD

* commit 'cc9c4242e3f77c20a943bdbc5fde5fe28cc2def6':
  Fix issue 2641884: Bluetooth volume is dependent on in call volume.
Merge commit 'a34d2c9a221deeb2699aacc99832e6ec2b63e8a9' into HEAD

* commit 'a34d2c9a221deeb2699aacc99832e6ec2b63e8a9':
  replaced deprecated getIntent with parseURI
Merge commit '4136c98ecc25861da5462d1364f1c4bfd7bd5c31' into HEAD

* commit '4136c98ecc25861da5462d1364f1c4bfd7bd5c31':
  Replaced deprecated String Constructor
Merge commit '521d9a798613cc9ad850f42343d2fbfa6c98f5c7' into HEAD

* commit '521d9a798613cc9ad850f42343d2fbfa6c98f5c7':
  Display index and count when running layout tests
Merge commit 'df3f1cc3fe1b9b4f598a084d6ff385482836f7ec' into HEAD

* commit 'df3f1cc3fe1b9b4f598a084d6ff385482836f7ec':
  Add KDDI/Softbank to available Shift_Jis mapping.
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