diff options
| author | Adam Powell <adamp@google.com> | 2010-09-03 16:52:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-03 16:52:22 -0700 |
| commit | 8eb992bef9e2cdeb65b496f88fd61cc74be049dc (patch) | |
| tree | 365957e2f10f97798d21ec768eca47c686f90315 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b8041333fff9fb44cbc72c5aa35a7890f8f629c3 (diff) | |
| parent | fe9fb17cbc06b00242c7e440232f4d0d7890b6a8 (diff) | |
am 0354f0ca: (-s ours) am 7627c221: DO NOT MERGE Tweak overscroll
Merge commit '0354f0cad59fd87a2756d3949213fe54ac2a50f0'
* commit '0354f0cad59fd87a2756d3949213fe54ac2a50f0':
DO NOT MERGE Tweak overscroll
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions