diff options
| author | Adam Powell <adamp@google.com> | 2010-10-05 16:46:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 16:46:05 -0700 |
| commit | 46dcc9b6229cc0f0f95d46b046b1ee1fe83cca1f (patch) | |
| tree | 19aabb3f1a49b5b96b18c4b1ffd531bfbf2ceffa /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 66be548f086c5cdcd69b85f6e96193f093590ef9 (diff) | |
| parent | dd81078e6ca939c791ee350d9f95da78bfa9abd0 (diff) | |
am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
Merge commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8' into gingerbread-plus-aosp
* commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8':
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