OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ef4dbb6
cc8f8ad
)
am cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
author
Jesse Hall
<jessehall@google.com>
Wed, 1 May 2013 02:32:39 +0000
(19:32 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 1 May 2013 02:32:39 +0000
(19:32 -0700)
* commit '
cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a
':
Fix glGetUniformIndices JNI prototype
Trivial merge