tree dd338b7c9df14f53b01e8d58209c1366eda3ceb3
parent e761f1e58f3946b01f9715e145b402db16f81367
parent 0272e60060162d2c32aec02d9cd1414dbbe14782
author Jamie Gennis <jgennis@google.com> 1321612642 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321612642 -0800

am 0272e600: am a37a78e2: Merge "GLES: add image external enums" into ics-mr1

* commit '0272e60060162d2c32aec02d9cd1414dbbe14782':
  GLES: add image external enums