OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80f9f26 34c0fb1)
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)
* commit '34c0fb183767b80e93a7cd77233ead5fe50bd822':
  Fix glGetUniformIndices JNI prototype


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