summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2011-11-09 14:36:34 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-09 14:36:34 +0000
commit18fc2a2723574230888a33aac75641b3804b91bb (patch)
tree8d4bb5c0feb92d67aaec43e9e24604dae2400c0c /opengl/libagl/TextureObjectManager.cpp
parenta364841e3136c8ee68bc435365f2c55f65d8d90a (diff)
parentd2ab7ea0c5e142654fb73b3816ba668a65527ed4 (diff)
am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1
* commit 'bc0b010ecc7254b0e2c7a0268e5242557579b471': Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions