| commit | 7bf5a43921217228fc4fb5f614df2aa195be7556 | [log] [tgz] |
|---|---|---|
| author | Jamie Gennis <jgennis@google.com> | Fri Nov 18 02:37:22 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 18 02:37:22 2011 -0800 |
| tree | 73b3a7aed8aecc66eea4e9e51afa2ebf9e9c591b | |
| parent | 2286e13978fc2a61803d4ff23f111e1aa215e7d9 [diff] | |
| parent | f9eed6f949526993aa3bcd5295f6bcb9c5eccb01 [diff] |
am 0272e600: am a37a78e2: Merge "GLES: add image external enums" into ics-mr1 * commit '0272e60060162d2c32aec02d9cd1414dbbe14782': GLES: add image external enums