diff options
| author | Jim Miller <jaggies@google.com> | 2010-06-07 19:24:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-07 19:24:45 -0700 |
| commit | c354b89c761149ee0d3393f4f388e8416f52e963 (patch) | |
| tree | dc7a2376d1b713062dfe2e22081241f7ed455b70 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e1855846a47e02b129acf978ec102cdd3d8b74f7 (diff) | |
| parent | 7188d6887e6d7a5d1dc86c77aeeec33c4ffc6568 (diff) | |
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