tree 85ba6917749b9f6fe0db7891ed0aba25fabd9bc1
parent 199c4825e2d64e3a5d8992155595462e75332cc7
parent a276fc59f535a2fb05701e8f49bb7adf4cefb3b2
author Joe Onorato <joeo@android.com> 1260321548 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260321548 -0800

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

Merge commit 'a276fc59f535a2fb05701e8f49bb7adf4cefb3b2' into eclair-mr2

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