diff options
| author | Grace Kloba <klobag@google.com> | 2010-04-14 16:26:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-14 16:26:55 -0700 |
| commit | 58ab590bc536566e3ff0f580cd190945125a9039 (patch) | |
| tree | 3e5f86120f1ff365c1753580da989ae35d07c503 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4024e20f1351cd97704734ba32db43157e50fea1 (diff) | |
| parent | 218aa6b8186bce2d98aef917adbc109d49ac2a87 (diff) | |
am 8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo
Merge commit '8a878dde9d15f75446bb5ca3137fccef8426ddd7' into froyo-plus-aosp
* commit '8a878dde9d15f75446bb5ca3137fccef8426ddd7':
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