tree 8f32295d7ad033a5b9f2fcedecad853a787ab777
parent 899ebdf3bf2ff349c91f6509369724bb3abc5941
parent 4909b554782c1970bce11fb421b0a06664a25718
author Jason Sams <rjsams@android.com> 1257465656 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257465656 -0800

am 4909b554: am a8f2c2b4: am 902051df: Merge change I0e27b5ca into eclair

Merge commit '4909b554782c1970bce11fb421b0a06664a25718'

* commit '4909b554782c1970bce11fb421b0a06664a25718':
  Fix texture upload bug for narrow texture of less than 32bpp.