summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2010-03-29 15:05:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-03-29 15:05:05 -0700
commitbc93a7e42559e9a64f144974eee0c23bb08f5f14 (patch)
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904 /opengl/tests/gl_basic/gl_basic.cpp
parent188eb788eaf98ea2842a4a72b778d378a6b3af56 (diff)
am 7671547b: (-s ours) Redesigned keyguard layout in the no-SIM case. DO NOT MERGE
Merge commit '7671547b04cf996fd30d095bd775217215a8e98e' into kraken * commit '7671547b04cf996fd30d095bd775217215a8e98e': Redesigned keyguard layout in the no-SIM case. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions