summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.h
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
commitc8281fdf0074dc237bb02f0bc1d1d4bbfc036082 (patch)
tree8dc1359d81604bdb5b4777aa34558617e3bd1945 /opengl/libagl/TextureObjectManager.h
parent5354504ec4c6cbbfa4c5046cbf040cfe2801fe98 (diff)
parent48a4ba577906524a39caf3d0af55e3ebc492355e (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.h')
0 files changed, 0 insertions, 0 deletions