diff options
| author | Adam Powell <adamp@google.com> | 2010-09-02 00:33:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-02 00:33:29 -0700 |
| commit | b73198021f6b73623b28a20cf4e5a473735b51a5 (patch) | |
| tree | a5b01e7714e08c28da6d945bea0296d013cbaccf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 309ae7d70176d8a50c9b7f14dcea02cd7048d48f (diff) | |
| parent | fad2382790772b0117ed859627529f52fd8a87e7 (diff) | |
am 0358def7: (-s ours) am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread
Merge commit '0358def77633b6548da06985cb22955a7e85abac'
* commit '0358def77633b6548da06985cb22955a7e85abac':
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