Merge commit '02648a4b8422733ed401f07edf8e426318bb2f8d' into HEAD

* commit '02648a4b8422733ed401f07edf8e426318bb2f8d':
  Clean up APN notifications.

Conflicts:
	core/java/android/net/MobileDataStateTracker.java
	services/java/com/android/server/ConnectivityService.java
	services/java/com/android/server/TelephonyRegistry.java
	telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl
	telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
Merge commit 'cac4d6d96551a756121361df2a83e7580e34a862' into HEAD

* commit 'cac4d6d96551a756121361df2a83e7580e34a862':
  To enable the reflection of rs_mesh etc. Side benefit: Better type checking. Double-checked with Nick that the extra "struct" is enabling reflection and type checking without incurring overhead.

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java
	services/java/com/android/server/SystemServer.java
Merge commit '2d6145993e19d2bb664766dbaf3c1e9ad3d12cdc' into HEAD

* commit '2d6145993e19d2bb664766dbaf3c1e9ad3d12cdc':
  Move OpenGL support out of ViewRoot into a new HardwareRenderer class.

Conflicts:
	api/current.xml
	core/jni/Android.mk
	core/jni/android_view_ViewRoot.cpp
Merge commit '4e916ad8c96fd7425e34ca1a8db82720fe046b73' into HEAD

* commit '4e916ad8c96fd7425e34ca1a8db82720fe046b73':
  Add PageUp and PageDown hot keys
Merge commit 'd92ea071c0d8161f63c3a6a3cb4875adf9a3b226' into HEAD

* commit 'd92ea071c0d8161f63c3a6a3cb4875adf9a3b226':
  Adding a stopLoading() method.

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

* commit 'ef4fd8e12e1928b1e9cdc03378bb1185d9e05cbe':
  Reimplement the PhoneNumberFormattingTextWatcher

Conflicts:
	Android.mk
Merge (-sours) commit 'ea8bd1d1676dd96f8f9726bb8f67fa18dec7b9c1' into HEAD

* commit 'ea8bd1d1676dd96f8f9726bb8f67fa18dec7b9c1':
  WLAN: Reset power save mode to startup value after DHCP response.
Merge commit 'd649c12815bcf944b2c97371f3f60716a42a1557' into HEAD

* commit 'd649c12815bcf944b2c97371f3f60716a42a1557':
  Make NetworkStateTracker an interface

Conflicts:
	core/java/android/net/NetworkStateTracker.java
	services/java/com/android/server/ConnectivityService.java
Merge commit 'f724eed5669762fdb0071e11ab3b38de77dd5c33' into HEAD

* commit 'f724eed5669762fdb0071e11ab3b38de77dd5c33':
  MTP provider: Add columns for MTP ObjectInfo dataset to the MTP objects table
Merge commit '0809c0e4c61fb1f64925081c811df86c73f7070f' into HEAD

* commit '0809c0e4c61fb1f64925081c811df86c73f7070f':
  CameraBrowser: New test app for the MTP content provider.
Merge commit 'dda568609232cdf82a2f050b0d0727627f49d448' into HEAD

* commit 'dda568609232cdf82a2f050b0d0727627f49d448':
  MTP: Add support for retrieving thumbnails to MTP content provider.
Merge commit '99b3452f404e1574508665ebb71362766d362603' into HEAD

* commit '99b3452f404e1574508665ebb71362766d362603':
  CameraBrowser: Display thumbnails for camera images.
Merge commit '0c702b88c5d0d4380930b920f5be6e66dd95a0d8' into HEAD

* commit '0c702b88c5d0d4380930b920f5be6e66dd95a0d8':
  Move shaping to native.
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.