diff options
| author | Jim Miller <jaggies@google.com> | 2011-12-05 22:12:54 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-05 22:12:54 -0800 |
| commit | a389059345a1558887cf0486aff53aa4374ae1d2 (patch) | |
| tree | 0784d17d80f88a0c09f9a2c4f6ecc4047af63cef /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ed7d42a38cc810130283941bc8d66823e6b6f6b0 (diff) | |
| parent | d76faf39631b7256820e7ed13a6783b90326a8c5 (diff) | |
Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions