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