diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-12-09 15:57:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-09 15:57:27 -0800 |
| commit | 8bee0b7b6eca772923c01510d12b1ad1d12c349f (patch) | |
| tree | 1d9e82046c6466883704e8e00b4b11826b6ece0f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 04ed6b1788f6c535bc95ac430f6bb528dd013471 (diff) | |
| parent | 17c4807d8e0bc8c4d784b4ca1793ef646015a508 (diff) | |
am 4c8454d8: am e851cdc6: Merge change Ifd95b9f5 into eclair
Merge commit '4c8454d8699cbedf473565bb92a80defaf95af09' into eclair-mr2-plus-aosp
* commit '4c8454d8699cbedf473565bb92a80defaf95af09':
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