diff options
| author | Adam Powell <adamp@google.com> | 2010-10-07 12:23:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 12:23:20 -0700 |
| commit | 08eff4fce2718fd5da2fd16fbfb65b1ad1df1c9c (patch) | |
| tree | 8d8c8b31eb975d7399055448629ec0c0517c7190 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 33b14f5880ab2ea52876ab46758aa1534351b29f (diff) | |
| parent | 46dcc9b6229cc0f0f95d46b046b1ee1fe83cca1f (diff) | |
am ee7e0efc: (-s ours) am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
Merge commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916'
* commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916':
DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions