OSDN Git Service

am 34c0fb18: am cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
authorJesse Hall <jessehall@google.com>
Wed, 1 May 2013 02:34:49 +0000 (19:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 May 2013 02:34:49 +0000 (19:34 -0700)
commitc59db7fdfeb8e95e6405945b0aeff1ed5e9f0012
tree42f7ad5f2de82b933575969eddb0bb31f750cc6a
parent80f9f26d1004a37e086c948609419ef1a8ae1467
parent34c0fb183767b80e93a7cd77233ead5fe50bd822
am 34c0fb18: am cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev

* commit '34c0fb183767b80e93a7cd77233ead5fe50bd822':
  Fix glGetUniformIndices JNI prototype