summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Romain Guy <romainguy@android.com> 2011-06-09 09:03:55 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-06-09 09:03:55 -0700
commite3f2baa793d194bfb104e5d99a1cee4fe51d418b (patch)
tree713706e3b687bb494c536ef68d1314634302de9f /opengl/libagl/TextureObjectManager.cpp
parentb9a541465d394ecc9a87832f812e13ae1a491154 (diff)
parent3e875c38918ea5a37c73b084a4b29efcb0d143f5 (diff)
am 34e9f249: am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
* commit '34e9f249a9b36ebe64476b997bca0edf990fbc0d': Disable plugins if setPluginsEnabled(false) called.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions