OSDN Git Service

am fa1a6eb5: am 0272e600: am a37a78e2: Merge "GLES: add image external enums" into...
authorJamie Gennis <jgennis@google.com>
Fri, 18 Nov 2011 10:42:19 +0000 (02:42 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Nov 2011 10:42:19 +0000 (02:42 -0800)
* commit 'fa1a6eb584dde49d424fa53a995a6d0dbd45155c':
  GLES: add image external enums


Trivial merge