summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Eric Fischer <enf@google.com> 2011-05-11 13:08:50 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-05-11 13:08:50 -0700
commit989523fd44b7dc10deedc926d908ec2c9f035aa7 (patch)
treef0e900d3d2671d56e8003a8324f087737265d536 /opengl/libagl/TextureObjectManager.cpp
parentd21ab0e151292738d61f0d05fd8289f647fb9e1b (diff)
parentca43ef6bc7ea52efb17718017e1f883e33504c05 (diff)
am ca43ef6b: (-s ours) am affca8fa: am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit 'ca43ef6bc7ea52efb17718017e1f883e33504c05': Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions