summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-02-26 13:21:20 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-26 13:21:20 -0800
commitaf21ccaf611e5ceb1a0a66534a7aa8a26b50d84d (patch)
tree2de34eaf949bd30904e7e7343a64fce86fec4561 /opengl/tests/gl_basic/gl_basic.cpp
parent673eb806cbf58f53975a1f1d58d53d870e079965 (diff)
parentebe5114be69f83ced315018b3c151c07824d80b6 (diff)
am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '69e19ae15baa5785667dbf45c7a2d508e429099b': DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions