| commit | 640a66ee2f2576ebc4137f866cbdbbbe4ca9ba86 | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Wed Jul 13 14:54:41 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 13 14:54:41 2011 -0700 |
| tree | 15071267a36e736aeab66667ab9b98c5fb28b023 | |
| parent | b52220aeefb155c5616c2506e0b528142688551a [diff] | |
| parent | 9e261942aa9dd9b653a09bb4bc0e66979664ce35 [diff] |
am 9e261942: am 735b35fb: am 14fa0201: am c559f761: Merge "GLES2 translator: fix glUseProgram error" * commit '9e261942aa9dd9b653a09bb4bc0e66979664ce35': GLES2 translator: fix glUseProgram error