summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2010-03-30 18:20:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-03-30 18:20:03 -0700
commita4eb91fef42c11bc43eb036268e8cd9706de3f4c (patch)
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904 /opengl/tests/gl_basic/gl_basic.cpp
parentf5f9c109d647eb014011c06f0edafed301da1536 (diff)
parent188eb788eaf98ea2842a4a72b778d378a6b3af56 (diff)
am 876b0644: Fix 2555028: Restore showing tab unlock before PIN & password entry.
Merge commit '876b0644770d1790b21e4049bc7f40851045dc86' into kraken * commit '876b0644770d1790b21e4049bc7f40851045dc86': Fix 2555028: Restore showing tab unlock before PIN & password entry.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions