diff options
| author | Andreas Huber <andih@google.com> | 2010-09-28 11:35:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 11:35:22 -0700 |
| commit | 20144fef23ee98f952ff4b96dc50b18e3378b230 (patch) | |
| tree | e3fe56f3a9a380af64cd06de2c2cab32a08165a0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | eb966fc91b06abea5d60a1338a4d115b4d6a7729 (diff) | |
| parent | e8d14e3a9f089a126e24109146792a46d9402050 (diff) | |
am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread
Merge commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7' into gingerbread-plus-aosp
* commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7':
Squashed commit of the following:
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions