| commit | 0272e60060162d2c32aec02d9cd1414dbbe14782 | [log] [tgz] |
|---|---|---|
| author | Jamie Gennis <jgennis@google.com> | Thu Nov 17 15:49:45 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 17 15:49:45 2011 -0800 |
| tree | ac24599f75ff1e7d0ed4436cc60994f68f4498e6 | |
| parent | 17c011985e53e7513c13bc1ed40aa65222dc660a [diff] | |
| parent | a37a78e2efe54892a744adfc6330c2d2179dee21 [diff] |
am a37a78e2: Merge "GLES: add image external enums" into ics-mr1 * commit 'a37a78e2efe54892a744adfc6330c2d2179dee21': GLES: add image external enums