diff options
| author | Grace Kloba <klobag@google.com> | 2010-04-14 16:33:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-14 16:33:27 -0700 |
| commit | 0df972e64216c9f9e64e0e83bd0fb9c7af9956ee (patch) | |
| tree | 744fcc6bd303f071d2ff642be0cefb7e8d8247b6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 01974f88fa20b12bfa91c0455ce73278c08cea64 (diff) | |
| parent | 58ab590bc536566e3ff0f580cd190945125a9039 (diff) | |
am e35a45b7: am 8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo
Merge commit 'e35a45b761ee38c04181bff0a72a6501101bf181' into kraken
* commit 'e35a45b761ee38c04181bff0a72a6501101bf181':
Pass WebKit scrollbar mode to Java. When scrollbar
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions