summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Wink Saville <wink@google.com> 2011-05-03 16:36:36 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-05-03 16:36:36 -0700
commit4191242bf74fff0da13322695aa24aaeaf269214 (patch)
tree16073b2283b2fa7198af948e30615c1e8833bf9d /opengl/libagl/TextureObjectManager.cpp
parente4b117ad45411cde4c9144a43f16fa9708de1aa2 (diff)
parent2ed006842bd5a5ce21c0909080d6446e2f871b7a (diff)
am ee081bf5: am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE
* commit 'ee081bf5ee936396a89d5bd2b29487047b260f49': IMS: Provide net_admin permission so that IPSec could be configured/used.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions