diff options
author | Dianne Hackborn <hackbod@google.com> | 2009-12-08 18:44:03 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-08 18:44:03 -0800 |
commit | 17c4807d8e0bc8c4d784b4ca1793ef646015a508 (patch) | |
tree | d42c2de87872fde784af4f919e40d673b4208a0e /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 80240139e39795c1176cf0ab7ab32986aa681422 (diff) | |
parent | 4f22b67c93e51398ca5720f0368068ea3d613b92 (diff) |
am e851cdc6: Merge change Ifd95b9f5 into eclair
Merge commit 'e851cdc6c48c977d05096847001a0601d892fd55' into eclair-mr2
* commit 'e851cdc6c48c977d05096847001a0601d892fd55':
Fix #2313382: SECURITY: Live wallpapers get touch events through the lock screen.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions