diff options
| author | Jim Miller <jaggies@google.com> | 2010-06-07 19:28:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-07 19:28:08 -0700 |
| commit | 77a885523c5d49bccca0540ab531740c49f456f1 (patch) | |
| tree | f0ec9769bcf30567a876534af93900770a2f7095 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7b2f655acbbd2b0a657e793b95b2b29cec504756 (diff) | |
| parent | 7d3eac2b0d963008a174911cad38eeff256e577b (diff) | |
am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions