summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Jake Hamby <jhamby@google.com> 2011-12-08 15:53:42 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-12-08 15:53:42 -0800
commit555fe79cdf037e7250f04591e60ecc8cff0cb95e (patch)
tree7c059e789361fef264cd4b8ab8caa3572fb9fc26 /opengl/libagl/TextureObjectManager.cpp
parentebfce84f7fd3e25fa08c36b155db91df90a59b3d (diff)
parentc40f70a5cb1f24a9ea0b5b0cadea75db8fc1cdd3 (diff)
am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
* commit 'c40f70a5cb1f24a9ea0b5b0cadea75db8fc1cdd3': Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions