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 | 7d70358a039426ca2da53cd3330638e2b12ca92e (patch) | |
| tree | 5aa8ded514c38c7225ca8eadd7d19443fd4053cc /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8a7fa44fdc4163083703cf1127839bcf35decb9f (diff) | |
| parent | bde25c207731783a62e3611586fe05cd35add0d9 (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