Merge commit '2134369e803e944af84e73dcaf9356609a5481c6' into HEAD

* commit '2134369e803e944af84e73dcaf9356609a5481c6':
  set some members to final, set database errorhandler to default if null.
Merge commit 'bebfb6aa0cc15eea0787c08b1247f53c7f0cd55b' into HEAD

* commit 'bebfb6aa0cc15eea0787c08b1247f53c7f0cd55b':
  Add missing library to linker command line.
  Add missing libraries, in order for gold to work.

Conflicts:
	core/java/android/database/sqlite/SQLiteStatement.java
Merge commit 'a82d3c550b5732293657e8b567daa381354688a1' into HEAD

* commit 'a82d3c550b5732293657e8b567daa381354688a1':
  MTP: Add support for host cancellation of file transfers.
Merge commit 'd81689aefcf57cfb692b73161b1a00511a90ee1e' into HEAD

* commit 'd81689aefcf57cfb692b73161b1a00511a90ee1e':
  Add support for logging curl commands for binary POST data
Merge commit 'aae74ad6144470c66e72b075ac3afeddb186fa98' into HEAD

* commit 'aae74ad6144470c66e72b075ac3afeddb186fa98':
  Creating the jni and java layer to integrate a3d
Merge commit 'd2cecfd3759d6785c5a2ed3f2f35fa1a30f757db' into HEAD

* commit 'd2cecfd3759d6785c5a2ed3f2f35fa1a30f757db':
  fix broken-test
Merge commit 'c3fa6304c997ccecf8ed15a4cbb7bd245128f3c3' into HEAD

* commit 'c3fa6304c997ccecf8ed15a4cbb7bd245128f3c3':
  Added ListPopupWindow. Refactored AutoCompleteTextView and Spinner (optionally) to use it. Added associated styles.

Conflicts:
	api/current.xml
	preloaded-classes
Merge commit 'e577d72a3be20e589437271f0e5ca474fab38124' into HEAD

* commit 'e577d72a3be20e589437271f0e5ca474fab38124':
  Revamp resources listing, part 1 (frameworks/base)

Conflicts:
	docs/html/resources/resources_toc.cs
Merge commit 'a984b38df5cfe6db0ba792bf2a6221f6b6072448' into HEAD

* commit 'a984b38df5cfe6db0ba792bf2a6221f6b6072448':
  Fix doc build
Merge commit 'c39a5dcbe151e2a55bf8d6c40b56ec875c8715d5' into HEAD

* commit 'c39a5dcbe151e2a55bf8d6c40b56ec875c8715d5':
  Fix issue #2733766: Crash in Gallery onDestroy: java.lang.RuntimeException

Conflicts:
	api/current.xml
	core/java/android/content/pm/ApplicationInfo.java
Merge commit 'ddcafcbd62c4efdc70bc626ab210a3c41dd1333c' into HEAD

* commit 'ddcafcbd62c4efdc70bc626ab210a3c41dd1333c':
  Fix 1684100: Making sure that empty package, type and resource ids are not accepted.
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