diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-09-01 13:21:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 13:21:07 -0700 |
| commit | 7d3ca9ceee57629f85450040960b17674b43a545 (patch) | |
| tree | a5b01e7714e08c28da6d945bea0296d013cbaccf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 25bb38f64c35f884ab9e96105a5cc5cbba8043ac (diff) | |
| parent | 2de45ab7c0c3f1539ea68272f7f4fe3fb7da39aa (diff) | |
am 9ce87963: (-s ours) am b1387127: Merge "Fix build (restore deleted assets)." into gingerbread
Merge commit '9ce879636ebe6e7eabbe4fa3f525cea25d5d9c10'
* commit '9ce879636ebe6e7eabbe4fa3f525cea25d5d9c10':
Fix build (restore deleted assets).
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions