commit | 2a35102a6e73a01675bde7ff24d91ce5ab38c1a0 | [log] [tgz] |
---|---|---|
author | David Turner <digit@android.com> | Thu Jul 14 09:18:10 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 14 09:18:10 2011 -0700 |
tree | a74eb85264bc595f3bdfe22deea12e60b5be24b7 | |
parent | 922d5aa97cd7a5ba7cb164c34e1974330edfd5e7 [diff] | |
parent | 72e117b6022d79b90609c5cb13c7a462b167281d [diff] |
am 72e117b6: am b2de740a: am 7fdf635d: Merge "opengles emulator: support for null in data parameter of glCompressedTexImage2D" * commit '72e117b6022d79b90609c5cb13c7a462b167281d': opengles emulator: support for null in data parameter of glCompressedTexImage2D