tree 9a7b43adea5d26da3ca87b90eeda7bf411fcc259
parent 3223093ffce0790cbd26b63cc73d0dab8cdd53ca
parent 53d0a74996bc2274e64c5582c63ae87beb9f5dde
author Joe Onorato <joeo@android.com> 1260480752 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260480752 -0800

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

Merge commit '53d0a74996bc2274e64c5582c63ae87beb9f5dde'

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