tree 85ba6917749b9f6fe0db7891ed0aba25fabd9bc1
parent ffd6081b5163cfb15845281c19455f6bc6f4ec40
parent 546917a5ad2ed8fb2013982156044faa29d11fc9
author Joe Onorato <joeo@android.com> 1260402964 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260402964 -0800

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.