summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2011-07-14 14:00:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-07-14 14:00:58 -0700
commit76652989ac868e97fdd8da6d95918e1c6a274fd2 (patch)
tree62a3555429c3caf6d6220df764adf91a9ee9b991 /opengl/tests/gl_basic/gl_basic.cpp
parent91249c1ef78dd3e7e3c080857badd54e02fa43c1 (diff)
parent1acde887d56bbebb681accf41a0c5b36e3853f12 (diff)
am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
* commit '54b2a3262738cdb3d0df747d8719e9a3cac33dfc': Show SIM blocked after 10 time puk wrong entries.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions