summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Amith Yamasani <yamasani@google.com> 2011-10-12 10:00:54 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-10-12 10:00:54 -0700
commit94eeada6518c1dadbc399ab154f1359e1220c86e (patch)
tree3597d49dcc076c8ff51999e4efc0c2348d42c357 /opengl/libagl/TextureObjectManager.cpp
parent24d970553f449c12d7c75d491dcbaa42f4775816 (diff)
parentf29340482b14631b0aa196456de7d718c8a2f26b (diff)
am 421648ed: (-s ours) Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0
* commit '421648ed06a2c944bc6a5fa866d461761533005b': Backup owner info as part of settings backup. DO NOT MERGE.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions