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.
tree: 9a7b43adea5d26da3ca87b90eeda7bf411fcc259
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE