Merge commit '9b949fce39f0f39ce9275b71d7c347210775e7a8' into HEAD

* commit '9b949fce39f0f39ce9275b71d7c347210775e7a8':
  Adding freetype font rendering to renderscript.
Merge commit '6495128049975815e46081874b8ede8efddad2f4' into HEAD

* commit '6495128049975815e46081874b8ede8efddad2f4':
  Fix return values for rsClamp.
Merge commit '9d5316e3f56d138504565ff311145ac01621dff4' into HEAD

* commit '9d5316e3f56d138504565ff311145ac01621dff4':
  Add colored rectangles implementation in OpenGLRenderer.
Merge commit 'f1ff21ac62a51f5ba8ca0821ea8a90f70957e25d' into HEAD

* commit 'f1ff21ac62a51f5ba8ca0821ea8a90f70957e25d':
  Fixes a few minor problems with AAPT
Merge commit '218284528bfeebe829633c6977d5fbbbfd144fcf' into HEAD

* commit '218284528bfeebe829633c6977d5fbbbfd144fcf':
  Fixed a documentation Bug (Issue 9236)
Merge commit '94345f45e7b82a22eb1e71205612315b7f44c2b4' into HEAD

* commit '94345f45e7b82a22eb1e71205612315b7f44c2b4':
  Fix zoom overview mode bug in the zoom manager.
Merge (-sorus) commit 'c086d9403f08d4f7505eff4dfdd61e0f22d26abf' into HEAD

* commit 'c086d9403f08d4f7505eff4dfdd61e0f22d26abf':
  Revert "am 256fc043: am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
Merge commit 'fd23461c2b9e482262f5af6b96fcabf99fecca7f' into HEAD

* commit 'fd23461c2b9e482262f5af6b96fcabf99fecca7f':
  Fix missing NL

Conflicts:
	libs/rs/rsNoise.cpp
Merge commit '5f5acca334bbff89b3801d2970d64b06e36614ba' into HEAD

* commit '5f5acca334bbff89b3801d2970d64b06e36614ba':
  Improved logging when there's an error creating the directories in getFilesDir()

Conflicts:
	core/java/android/app/ContextImpl.java
Merge commit '96e6bdb033b2997a4215b70acc3777fe495b9aca' into HEAD

* commit '96e6bdb033b2997a4215b70acc3777fe495b9aca':
  Add obtainMessage functions to HSM
Merge commit 'e8db3a3f4016184b08ff39b0cdc2cc02e852f7e7' into HEAD

* commit 'e8db3a3f4016184b08ff39b0cdc2cc02e852f7e7':
  Replaced deprecated setButton Methodcalls
Merge commit 'a47130783b386df4a371d9b6898eaae5720260f6' into HEAD

* commit 'a47130783b386df4a371d9b6898eaae5720260f6':
  Replaced deprecated calls to setButton and setButton2
Merge (-sours) commit '924af70019f1cc82d850a0c29c2606a2f4faf5cf' into HEAD

* commit '924af70019f1cc82d850a0c29c2606a2f4faf5cf':
  Refactor find and select dialogs
Merge commit '6188c2746d0211985c5a656442c92b591dfdfd2a' into HEAD

* commit '6188c2746d0211985c5a656442c92b591dfdfd2a':
  remove some not-so-useful-logging
Merge commit '10c543da2f407d7a4e2a6fa0375e39ec0d232233' into HEAD

* commit '10c543da2f407d7a4e2a6fa0375e39ec0d232233':
  Reduced Warnings by adding Type Arguments and removing unused imports
Merge commit 'eeeaccc89971268a0cc63ac0ae0868b5c003c9a9' into HEAD

* commit 'eeeaccc89971268a0cc63ac0ae0868b5c003c9a9':
  Add support for non-VBO drawing in Meshes.
Merge commit 'c7d53494f1fbd9f9d74af89053ff9fdb1ccbac6c' into HEAD

* commit 'c7d53494f1fbd9f9d74af89053ff9fdb1ccbac6c':
  Implement quickReject() and drawRect().
Merge commit '7ae7ac48aa2b53453c9805075171ecd5bcafd7de' into HEAD

* commit '7ae7ac48aa2b53453c9805075171ecd5bcafd7de':
  Convert tabs to spaces.
Merge commit '3eb9b66deb18888d7f52ed901abf342506aa3db7' into HEAD

* commit '3eb9b66deb18888d7f52ed901abf342506aa3db7':
  New XmlAdapters sample code.

Conflicts:
	Android.mk
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.