diff options
| author | Leon Scroggins <scroggo@google.com> | 2011-02-02 16:20:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-02 16:20:43 -0800 |
| commit | a3339f8cef113c3b4495432d964a0e2fdbddad7d (patch) | |
| tree | ae32e366e7eea386e2213a28ed10d5e6bad0b31c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | eebca4cdf85989b24ecc3f6f3a198218216b8549 (diff) | |
| parent | 67cc2ff1547843025980375b7645683de53fb391 (diff) | |
am 8287edd3: (-s ours) am 8257e4d7: Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb
* commit '8287edd3ae2362f01c4d3b9d76246dd15be54a11':
DO NOT MERGE. Only scroll if the IME is open in certain cases.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions