summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Xavier Ducrohet <xav@android.com> 2011-06-09 09:04:38 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-06-09 09:04:38 -0700
commit29951e3d5e22d8a74e96fecc19a8c3ac0d5eabf5 (patch)
tree713706e3b687bb494c536ef68d1314634302de9f /opengl/libagl/TextureObjectManager.cpp
parent82dd50b3d638f6ab8ddfdde7a796413371893b00 (diff)
parent4eed1b7dca9e2fe4325504401429e41e4a373795 (diff)
am 3eb9f832: (-s ours) am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread
* commit '3eb9f8326e6d72be671bf0226965ca3231a25d7d': Cherrypick d1ed33c4 from hc-mr1. do not merge.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions