OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5faee2c 11f8fde)
am a37a78e2: Merge "GLES: add image external enums" into ics-mr1
authorJamie Gennis <jgennis@google.com>
Thu, 17 Nov 2011 23:49:45 +0000 (15:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Nov 2011 23:49:45 +0000 (15:49 -0800)
* commit 'a37a78e2efe54892a744adfc6330c2d2179dee21':
  GLES: add image external enums


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help