summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2011-05-16 13:13:00 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-05-16 13:13:00 -0700
commit6d4f911185321a07187c51adb67361defc6d7864 (patch)
tree1f465c937ea4ed997c1a9048c3d9c9fe3bf79276 /opengl/libagl/TextureObjectManager.cpp
parentea5d261564edebb0c11beae9e1ffc07f1d1f271f (diff)
parentb181f7ffa26d931afde0565764842dabcf06f5b8 (diff)
am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
* commit '0eac092766d7871b34927442ee0b6e27e7e1317b': DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions