summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Dave Santoro <dsantoro@google.com> 2011-11-17 15:12:52 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-17 15:12:52 -0800
commit2998cb124212b1993a7d9fb5a93522b7955e329b (patch)
tree27bbc5d508fc7a2ddaa93dcf8bdc84e0ba691b97 /opengl/libagl/TextureObjectManager.cpp
parentc0a9a1c232d1e431c5e8078e55af50d25fc840b2 (diff)
parente16f48b12632b4fdc62e501167a5b228307bff7e (diff)
am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1
* commit '60e345a9a95a0f24804f729eeb5216012d1bcbac': Unhide social stream permissions.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions