diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-09-01 11:48:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 11:48:19 -0700 |
| commit | 2de45ab7c0c3f1539ea68272f7f4fe3fb7da39aa (patch) | |
| tree | 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 260c04a4c5ab82e092e09559647c03a6fa6c53d2 (diff) | |
| parent | b56665681c4d4d141e381fd6c1e6f5d7c90d45c0 (diff) | |
am b1387127: Merge "Fix build (restore deleted assets)." into gingerbread
Merge commit 'b1387127f18b73d7f1038dad6e432329b78264ae' into gingerbread-plus-aosp
* commit 'b1387127f18b73d7f1038dad6e432329b78264ae':
Fix build (restore deleted assets).
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions