diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-09-13 14:43:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-13 14:43:16 -0700 |
| commit | c999d8025e3564f78593e766aeffc485c5924ca5 (patch) | |
| tree | 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 632eb616a2ac26f873e17b07f1798a64f7abedea (diff) | |
| parent | 7be0c0b49786abf358f34c611fbc3b75f357e336 (diff) | |
am 4de4f09e: (-s ours) am fbd26467: Merge "DO NOT MERGE" into gingerbread
Merge commit '4de4f09e8ed95255c1077cfbbaf018877221455d'
* commit '4de4f09e8ed95255c1077cfbbaf018877221455d':
DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions