diff options
| author | Adam Powell <adamp@google.com> | 2010-09-02 00:31:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-02 00:31:03 -0700 |
| commit | fad2382790772b0117ed859627529f52fd8a87e7 (patch) | |
| tree | 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 58d1e77692a7bfa7b37c2a86a7991e0ca84d684e (diff) | |
| parent | 1b7a93030cf30171ef8c58d47ee1f7b61b2cc2b7 (diff) | |
am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread
Merge commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211' into gingerbread-plus-aosp
* commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211':
DO NOT MERGE Overscroll continues; asset and behavior tweaks.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions