diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-03-07 10:50:54 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-07 10:50:54 -0800 |
| commit | 1c1a1a73e06e9fc7c963e4003ad9f81505d9a8ec (patch) | |
| tree | a14464123bebfff64910d7c44b1759a699a6caa8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | eb40916cbacd8471e3b4dd57cedb99eff84e64d4 (diff) | |
| parent | 9bcade1d19caca5fc574ca21809304a1380793c2 (diff) | |
am ec1f1f4c: Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
* commit 'ec1f1f4cfc6e253cee4320fe33a385d2218a9bb2':
When the user touches a peeked notification, reset the fadeout timer.
Fix touches on glowing region around panel.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions