am 546917a5: am a276fc59: Fix 2306862 - Launcher2 crashed: in libs/rs.  Uploading texture without a context.

Merge commit '546917a5ad2ed8fb2013982156044faa29d11fc9' into eclair-mr2-plus-aosp

* commit '546917a5ad2ed8fb2013982156044faa29d11fc9':
  Fix 2306862 - Launcher2 crashed: in libs/rs.  Uploading texture without a context.