diff options
| author | Mindy Pereira <mindyp@google.com> | 2010-09-26 18:37:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-26 18:37:04 -0700 |
| commit | 7981a338faeaaa419102d9ef5ed973f1cfc7224f (patch) | |
| tree | 28de80333907879eb5e3aa31e9eafff1e8f08fbb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 660026ccacfc2d62457f5fb9284e7b759b47f33b (diff) | |
| parent | 70da97b0dd39f0e571e421abc70a67ab6547e0d2 (diff) | |
am 08c09b0f: Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread
Merge commit '08c09b0f84b23627b4cd02e1b9a642952fbd2e7f' into gingerbread-plus-aosp
* commit '08c09b0f84b23627b4cd02e1b9a642952fbd2e7f':
DO NOT MERGE. Only 1 edge glow should be growing at a time.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions