OSDN Git Service

am 5e530e02: am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUnif...
authorAndrew Hsieh <andrewhsieh@google.com>
Wed, 7 Nov 2012 04:43:06 +0000 (20:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Nov 2012 04:43:06 +0000 (20:43 -0800)
commit168dfe71bfafebaa26b6f75df553f5fad7607669
tree6003150f794d9c48985d408a8b669e49105630c1
parentc2e5b273c43e3d1649c5f8cecb47c7d84afb6f6e
parent5e530e02bc3073a2e2469df3c333ae14f1b37433
am 5e530e02: am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"

* commit '5e530e02bc3073a2e2469df3c333ae14f1b37433':
  Fix return type of glGetAttribLocation and glGetUniformLocation