commit | 2e8d5e1dabd51a147317c01ad894591465fe45a0 | [log] [tgz] |
---|---|---|
author | David Turner <digit@android.com> | Mon Jun 06 09:08:05 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 06 09:08:05 2011 -0700 |
tree | 47d25db722ee0b0146cface0f2fd830b154a51b3 | |
parent | 9178b80ce4951119f8ecac7a595e0d2a1b4abdb9 [diff] | |
parent | 4de570c974d0d001edd95804eb1a95c1078cfa6b [diff] |
am 4de570c9: am f3c023e4: Merge "opengl translator: GLSL ES translation" * commit '4de570c974d0d001edd95804eb1a95c1078cfa6b': opengl translator: GLSL ES translation