diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-10-18 09:30:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 09:30:57 -0700 |
| commit | 4c07b64c3e03fe180f30d90d5c93c0ae05176aa1 (patch) | |
| tree | 60e01d1b54244b5da6a07286d5794b6fb7346442 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5be378c4d7ad197353124a97460e1517e6ef45ad (diff) | |
| parent | e04b251b758188ae390b1d29f3e07942b9fb70a7 (diff) | |
am 53820a96: (-s ours) am 7ef6834e: Merge "DO NOT MERGE" into gingerbread
Merge commit '53820a9694a8f3c6564edb6caf90350e96b57567'
* commit '53820a9694a8f3c6564edb6caf90350e96b57567':
DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions