Merge commit 'f1a4a0a5b712963b77bf019886cf73cf6bc1b7b4' into HEAD

* commit 'f1a4a0a5b712963b77bf019886cf73cf6bc1b7b4':
  More cleanup after removing the Cursor update logic.

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

* commit 'ce0537b80087a6225273040a987414b1dd081aa0':
  Add hooks for drawBitmap().
Merge commit '364703c6fa4aa1a7d2ef5b0c048ea2a0d57a4c40' into HEAD

* commit '364703c6fa4aa1a7d2ef5b0c048ea2a0d57a4c40':
  Fix the build.
Merge commit 'fe8809471a40cac8acc984adfa51c39e13e83947' into HEAD

* commit 'fe8809471a40cac8acc984adfa51c39e13e83947':
  Remove unnecessary return and add bitmap generation ID tracking.
Merge commit 'b6b34891fa7f76c99f5e9a3096576ada86c99f1e' into HEAD

* commit 'b6b34891fa7f76c99f5e9a3096576ada86c99f1e':
  Fixing freetype init/uninit code. Removing debug output from stream.
Merge commit 'a7db03705f53c59e63e63c2e67e2db78f8226dcc' into HEAD

* commit 'a7db03705f53c59e63e63c2e67e2db78f8226dcc':
  Define measuring behavior for action bar/context mode custom views
Merge commit '0a4a70daba81351e4d12ca4faae6d135c1f0d2e2' into HEAD

* commit '0a4a70daba81351e4d12ca4faae6d135c1f0d2e2':
  Fix the initial reflow width when switch between basic pages.
Merge commit 'c1396e93b6a5286a5183c00c781b62e940a12c1f' into HEAD

* commit 'c1396e93b6a5286a5183c00c781b62e940a12c1f':
  Add implementation for drawBitmap().
Merge commit '072339405191492e85e12e164a36c4cd15858790' into HEAD

* commit '072339405191492e85e12e164a36c4cd15858790':
  Try to fix the simulator build.
Merge commit '8ba548f81d1ab5f1750cbf86098c4a14e0b8bead' into HEAD

* commit '8ba548f81d1ab5f1750cbf86098c4a14e0b8bead':
  Add implementation for drawBitmap(Bitmap, Rect, Rect, Paint)
Merge commit 'fa57523b60dd335a227bff7fbddbf05ab0755b5d' into HEAD

* commit 'fa57523b60dd335a227bff7fbddbf05ab0755b5d':
  Remove EditStyledText from the framekwork
Merge commit 'a08491a08bd81e0d07ef5934cccec473e30ca728' into HEAD

* commit 'a08491a08bd81e0d07ef5934cccec473e30ca728':
  Add a class to represent the set of sensitive features of a web application
Merge commit 'd0e1a9f40e4d9b41d83be3b3c62d6849cb37d6a6' into HEAD

* commit 'd0e1a9f40e4d9b41d83be3b3c62d6849cb37d6a6':
  MTP: Remove an unnecessary thread from the MtpClient class.
Merge commit '9a9fd64ab79f064f55000ef18e094b7459d03222' into HEAD

* commit '9a9fd64ab79f064f55000ef18e094b7459d03222':
  Remove the TODO as it has been fixed with changes for http://b/issue?id=2666473.

Conflicts:
	core/java/android/webkit/WebView.java
Merge commit '4b08d3e4372d994ac5c5a97d8da528e5d682e732' into HEAD

* commit '4b08d3e4372d994ac5c5a97d8da528e5d682e732':
  Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
Merge commit '60b0c1dada455de304834a6d62ec0231da4c7b6c' into HEAD

* commit '60b0c1dada455de304834a6d62ec0231da4c7b6c':
  Update fountain with multitouch support.
Merge commit 'e44afae7ff91edb80142fc62ce2bc2cb9d133d09' into HEAD

* commit 'e44afae7ff91edb80142fc62ce2bc2cb9d133d09':
  Add AbsListView#smoothScrollToPositionFromTop

Conflicts:
	api/current.xml
	services/java/com/android/server/SystemServer.java
Merge commit 'd26920ada05843e736d78709812e03797eedee55' into HEAD

* commit 'd26920ada05843e736d78709812e03797eedee55':
  Adding timelapse capture from videocamera.

Conflicts:
	media/libmediaplayerservice/StagefrightRecorder.cpp
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.