summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Jim Miller <jaggies@google.com> 2012-01-18 16:46:12 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-01-18 16:46:12 -0800
commit8962170b2ae34fab3a3feefb2a3a78bee593e78b (patch)
tree485b152b97bf8321fdd223f35587bb4294672be8 /opengl/libagl/TextureObjectManager.cpp
parentbf927a024bd3a314620ef1a2913652ff56995384 (diff)
parentb82dd313e75b4940d6568f35b8b04efe7dcb071d (diff)
am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1
* commit '230a709285abc5dfd92f05d91a8997d52a59d3c7': Fix 5863053: Add method to lock screen immediately.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions