tree 40a6020b65637bce1a4fc446611f1d1f448b9b32
parent 917d38b63ee867874b2da4629fd5fcb336daf0d4
parent 4ca8cd85821b42fd40e88b45195f7d8a23062276
author David Turner <digit@android.com> 1309962601 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309962601 -0700

am 4ca8cd85: Merge "1.1 Translator: fix bug in glDeleteTexture"

* commit '4ca8cd85821b42fd40e88b45195f7d8a23062276':
  1.1 Translator: fix bug in glDeleteTexture