diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-02-26 13:33:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-26 13:33:12 -0800 |
| commit | 70e3799cc0bc766f4e94731830f7b7a8d74c39f8 (patch) | |
| tree | 12f670ba91b8bded5a0290bdc871564d96be4966 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c3ce4d6b447fb6631746e3ac7830a68b1bfe8d49 (diff) | |
| parent | af21ccaf611e5ceb1a0a66534a7aa8a26b50d84d (diff) | |
am 1b895639: (-s ours) am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '1b8956398be6aeacf0383d8e0931771dbd3a6d2b':
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