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:
eb3610e
f31510a
)
am f31510a2: Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
author
Mathias Agopian
<mathias@google.com>
Wed, 17 Apr 2013 06:36:58 +0000
(23:36 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 17 Apr 2013 06:36:58 +0000
(23:36 -0700)
* commit '
f31510a2ac0807cf3d4224a73fc3f8f691f42f5a
':
Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
Trivial merge