diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-12-02 11:35:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-02 11:35:46 -0800 |
| commit | 79764eb8fefe425e558edf0662adb4aaa537d746 (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 880826483d7e811cf8a74c2ccc79402b577ce0f2 (diff) | |
| parent | bfad92e459d13b6b551dfb8e9680b00b60981bcc (diff) | |
am 15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
Merge commit '15ee33d4d475dc31709808a64120e56d555e992e' into eclair-plus-aosp
* commit '15ee33d4d475dc31709808a64120e56d555e992e':
Revert "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