summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Wei Huang <weih@google.com> 2011-11-09 14:35:56 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-09 14:35:56 +0000
commitce417ad019605255f9b1d19ac07a3afd5887cc70 (patch)
tree003994e335f13de9e020a626dc41355b6a430256 /opengl/libagl/TextureObjectManager.cpp
parentcd99c18818e2ecf6cfd46c48f4e00675af2b6448 (diff)
parent666a5e7e84e71a313a0bd3d868f51875e7403a0b (diff)
am ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1
* commit 'ea50748b546e7dc21dc06195af5f0a8f2b812417': Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions