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