diff options
| author | Erik <roboerik@android.com> | 2010-09-10 11:30:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 11:30:00 -0700 |
| commit | 2b8ecb81317c8d0455fdc62c5f2597af06bfd51c (patch) | |
| tree | 9a7df8ac6775e0425ea28e429e271d85701b7710 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7f9c52076a4f9c022c515fa9165cd7a1bda48342 (diff) | |
| parent | 057da22c3026137e9bf4705c515f41db78b51638 (diff) | |
am a388a324: Merge branch \'gingerbread-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into gingerbread-plus-aosp
Merge commit 'a388a3245dfeea057bc7ec6b62e474994b3ff946'
* commit 'a388a3245dfeea057bc7ec6b62e474994b3ff946':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions