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
commit4ca90a0b3c12c51bc2ef3953a625170ba9de3156 (patch)
tree0784d17d80f88a0c09f9a2c4f6ecc4047af63cef /opengl/libagl/TextureObjectManager.cpp
parent2bf2a9874ddbd165ec2d28ca9d7b05b16e58e9f6 (diff)
parentf73a44533efa35fc601f43bf3ad6f06306ff5bea (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