diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-12-02 05:04:29 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-02 05:04:29 -0800 |
| commit | e1ba52a2f60ae9ef0f29276ae3cbece376ea95e5 (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 181cebd32b64a3145b85993a5a170eb54cc5d88f (diff) | |
| parent | bfad92e459d13b6b551dfb8e9680b00b60981bcc (diff) | |
am b684251e: Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
Merge commit 'b684251e8f1e85ea9483af2b80bc92f0fd8ded1c' into eclair-plus-aosp
* commit 'b684251e8f1e85ea9483af2b80bc92f0fd8ded1c':
Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions