diff options
| author | Mindy Pereira <mindyp@google.com> | 2010-10-04 10:20:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 10:20:47 -0700 |
| commit | a69e37dc3f97ff1f3470bde218febb16f2d52bdc (patch) | |
| tree | c7f57a471ef7a293ba101955c412b9d2376d3908 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 441fc0c9fe43daa0a88054a31efae397dce5d626 (diff) | |
| parent | dcd7d85a701be724bbfee285bfb08c9f4f24df73 (diff) | |
am 53fb09b4: (-s ours) am 106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread
Merge commit '53fb09b42f8862650f959c30c1ab104142fa873a'
* commit '53fb09b42f8862650f959c30c1ab104142fa873a':
DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions