Merge commit '61d10a4e43aea5cc60b849ce3cee718792233146' into HEAD

* commit '61d10a4e43aea5cc60b849ce3cee718792233146':
  Update fountain to use boolean rather than ints for true/false.
Merge commit 'c05df82b369507c804df042e47067434f329b150' into HEAD

* commit 'c05df82b369507c804df042e47067434f329b150':
  update 404'd source.android.com URLs
Merge commit 'bd6b79b40247aea7bfe13d0831c6c0472df6c636' into HEAD

* commit 'bd6b79b40247aea7bfe13d0831c6c0472df6c636':
  Add implementations for saveLayerAlpha() and textured rects.
Merge commit '213c853f40074633d61bb7705843a9f4a00513b3' into HEAD

* commit '213c853f40074633d61bb7705843a9f4a00513b3':
  Make hasIccCard return true if RUIM card is present.
Merge commit '2e896830f83d3398b9dac51ac0e9ad803a5bacdb' into HEAD

* commit '2e896830f83d3398b9dac51ac0e9ad803a5bacdb':
  Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
Merge commit '5cbbce535744b89df5ecea95de21ee3733298260' into HEAD

* commit '5cbbce535744b89df5ecea95de21ee3733298260':
  Reduced the complexity of layers composition.

Conflicts:
	services/java/com/android/server/KeyInputQueue.java
	services/java/com/android/server/WindowManagerService.java
Merge commit '38a1054c1c79c422554346dbddf12cd3e4d5267c' into HEAD

* commit '38a1054c1c79c422554346dbddf12cd3e4d5267c':
  Fix hang when error in SIM card communication
Merge (-sours) commit '6d85ea9c556be7b49302d2f35f4ebc99b4827366' into HEAD

* commit '6d85ea9c556be7b49302d2f35f4ebc99b4827366':
  Keep track of remaining fd when devices are removed
Merge commit '4aef697d58bc142b96953cb2623b06981af2abc9' into HEAD

* commit '4aef697d58bc142b96953cb2623b06981af2abc9':
  Initial pass at unit tests for ZoomManager.
Merge commit 'b983c893d4307caec8504e6b46ca69ae859b25d3' into HEAD

* commit 'b983c893d4307caec8504e6b46ca69ae859b25d3':
  Rename a data storage object to better reflect its intended usage.
Merge commit '924cc94caaab5e9ad0714e0877e871290316e2b1' into HEAD

* commit '924cc94caaab5e9ad0714e0877e871290316e2b1':
  Reduce Tethering Logging.

Conflicts:
	services/java/com/android/server/connectivity/Tethering.java
Merge commit '445646c52128a763b56ed7bb3bd009e2f33e3e4f' into HEAD

* commit '445646c52128a763b56ed7bb3bd009e2f33e3e4f':
  Improvements to ListFragment.

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

* commit 'd2db2a579440608453994b64eb5b425840f5307a':
  Add a new attribute to allow widgets to specify a preview image.

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

* commit '026c5e16704e817cac7d9c382914c947e34f87e0':
  Implement support for PorterDuff's blending modes.
Merge (-sours) commit '0cfd0f45d95c617300d3dbedb99e300e01184328' into HEAD

* commit '0cfd0f45d95c617300d3dbedb99e300e01184328':
  Fix build, update current.xml
Merge commit 'd55a86120dd1e8ebcc6906c9ffd463f7460348da' into HEAD

* commit 'd55a86120dd1e8ebcc6906c9ffd463f7460348da':
  Add support for saveLayer().
Merge commit 'b0c56b24aada23461c04746926ba185dfdbb8b5b' into HEAD

* commit 'b0c56b24aada23461c04746926ba185dfdbb8b5b':
  Fix SDK build.
Merge commit '3d59f8b41874e5e1183e236b7b079a0a0c510f6c' into HEAD

* commit '3d59f8b41874e5e1183e236b7b079a0a0c510f6c':
  Correct VM number updation during MBDN refresh.
Merge commit '074c08c4ebbba0875549496829ee7872dd153ee8' into HEAD

* commit '074c08c4ebbba0875549496829ee7872dd153ee8':
  Pass the WebView context to the GeolocationService from WebKit
Merge commit 'f0785a66f0e8447c30f47a760905bc74644f5c10' into HEAD

* commit 'f0785a66f0e8447c30f47a760905bc74644f5c10':
  set maximum image size