OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
de8205f
6c92fe3
)
am 6c92fe34: am 227fffee: Fix potential bug in setMaxTextureCount and limit the numbe...
author
Nicolas Roard
<nicolas@android.com>
Sat, 19 Feb 2011 05:09:07 +0000
(21:09 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Sat, 19 Feb 2011 05:09:07 +0000
(21:09 -0800)
* commit '
6c92fe3486d362d49c3d2a0399611797d35173d1
':
Fix potential bug in setMaxTextureCount and limit the number of textures to 154
Trivial merge