diff options
| author | Jim Miller <jaggies@google.com> | 2011-12-05 22:14:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-05 22:14:37 -0800 |
| commit | 74015225ec5bd0fb516f907712fe4e8730a57efd (patch) | |
| tree | 0784d17d80f88a0c09f9a2c4f6ecc4047af63cef /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4759837dd3bed253e7ed411049a0902f370b20b3 (diff) | |
| parent | a389059345a1558887cf0486aff53aa4374ae1d2 (diff) | |
am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
* commit '17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc':
Fix 5705837: Dismiss keyguard when launching Settings from Statusbar
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions