diff options
| author | Adam Powell <adamp@google.com> | 2010-09-03 14:17:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-03 14:17:16 -0700 |
| commit | 29f403318b3b68293cddcfac38d7c12d40466937 (patch) | |
| tree | 365957e2f10f97798d21ec768eca47c686f90315 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | dc5015c43a7761fe819f39066cf0908e447464a9 (diff) | |
| parent | 0cd97934e0126e7bc41c7f19d235c01b28ddf8cd (diff) | |
am f9a1ff41: (-s ours) am e7c02ef4: Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread
Merge commit 'f9a1ff4173fd366fb263f0d3cae71014404c4612'
* commit 'f9a1ff4173fd366fb263f0d3cae71014404c4612':
Fix bug 2973252 - Make overscroll glow respect ifContentScrolls
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions