tree e4d405c1c5c6d36347680d7301aac853234f6431
parent 333a2f8147c61595bdb239e8ea41650bd56ce0c7
parent 37577cb6ff4b68d4dde88238ba8bc0f545b2cddb
author David Turner <digit@android.com> 1310425019 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310425019 -0700

am 37577cb6: am 05832ade: Merge "opengles Translator: fix uncompress palleted A1 textures"

* commit '37577cb6ff4b68d4dde88238ba8bc0f545b2cddb':
  opengles Translator: fix uncompress palleted A1 textures