OSDN Git Service

am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
authorAndrew Hsieh <andrewhsieh@google.com>
Wed, 7 Nov 2012 04:41:34 +0000 (20:41 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Nov 2012 04:41:34 +0000 (20:41 -0800)
commit5e530e02bc3073a2e2469df3c333ae14f1b37433
treece90daccf0b729c329acf5f193505da2be275d29
parente2d4cc28d72db0d49e61ed4ceeb878436cafb23a
parenta151a19db2fa07295837027fb5d84c02401cc78d
am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"

* commit 'a151a19db2fa07295837027fb5d84c02401cc78d':
  Fix return type of glGetAttribLocation and glGetUniformLocation
opengl/libs/GLES_trace/src/gltrace_fixup.cpp