diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-04-13 18:02:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-13 18:02:11 -0700 |
| commit | 77701be29f30d1c5a60ac48365bbd888701aad82 (patch) | |
| tree | 744fcc6bd303f071d2ff642be0cefb7e8d8247b6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a3752230de371cc4b2adcf85ef14d1044dc42790 (diff) | |
| parent | 8c16dfac1ac3b96425a335e6f587815241420d3e (diff) | |
am fbd22f07: am ae8c2c71: Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo
Merge commit 'fbd22f072b48be4b465085fb5354890e2f10fd32' into kraken
* commit 'fbd22f072b48be4b465085fb5354890e2f10fd32':
Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions