summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Daniel Sandler <dsandler@android.com> 2011-11-17 11:46:23 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-17 11:46:23 -0800
commit47696dab423fb5cb352cece0cafb715bb2f73d7b (patch)
tree27bbc5d508fc7a2ddaa93dcf8bdc84e0ba691b97 /opengl/libagl/TextureObjectManager.cpp
parentdb3d3ab19072be0c31580b9baa33614404846d1c (diff)
parent1cd383626b837ace340293a16b027229a1302a3f (diff)
am a092482c: am 293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1
* commit 'a092482c17830b985798d5da9c1d1951735bacf3': Activate Dreams (screen saver) when desk-docked.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions