summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2011-12-12 15:39:23 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-12 15:39:23 -0800
commit74bc6075e13f871a47622d2a08d91b259448a24e (patch)
tree17a01b8d785326379ea875618e42ef0effd04c37 /opengl/libagl/TextureObjectManager.cpp
parent8ca8f5ed128cd31f0122b9d778e0dd37cb8756c9 (diff)
parentf3ea02319fc8d1f882ef7f392c245e197ab858de (diff)
am f3ea0231: (-s ours) am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'f3ea02319fc8d1f882ef7f392c245e197ab858de': Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions