diff options
| author | Jim Miller <jaggies@google.com> | 2010-06-08 16:33:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-08 16:33:26 -0700 |
| commit | 9cc61ca4877e8215ecf691d0cae2876be8329249 (patch) | |
| tree | 1a1c3f4f0dc80c03e68d3bff277e82dad0005830 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 53503a97a9afa9e876b1e95ca7e3b46c76aa4f15 (diff) | |
| parent | 5ca447aa0c63a20bf1e121f0a54bbd1a46ccf27d (diff) | |
am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into kraken
* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
Fix 2737842: Disable KeguardManager API if device policy is enabled
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions