commit | 01427d12868d5943cb80d430c2bcecd535b2c977 | [log] [tgz] |
---|---|---|
author | David Turner <digit@android.com> | Wed Jul 13 18:04:57 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 13 18:04:57 2011 -0700 |
tree | c250d9f883c46891484e8adbc91f9ea882a3603d | |
parent | 0fecb41c1154c5b2ef54677fa32bedf8d0f221ad [diff] | |
parent | c86fa4b8f34ab06f463d08a447f86f296b38ae12 [diff] |
am c86fa4b8: Merge "opengles emulator: support NULL as parameter to glTexImage2D (gles1)" * commit 'c86fa4b8f34ab06f463d08a447f86f296b38ae12': opengles emulator: support NULL as parameter to glTexImage2D (gles1)