summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Costin Manolache <costin@google.com> 2010-05-12 19:06:39 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-12 19:06:39 -0700
commit58ed31eafec12e4c4a77405c93671cb888fe837e (patch)
tree028086af264a1d96a17a8623d823a1923ba12af9 /opengl/libagl/TextureObjectManager.cpp
parenta4d5d705ae3531e195f9841a5caaedf71c8bbb9c (diff)
parentc7e64a8e4bd950b615675f7dce0a0f411f568c7e (diff)
am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp * commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e': Bug 2680071: Rename the Cloud to Device
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions