diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-09-13 11:51:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-13 11:51:55 -0700 |
| commit | 7be0c0b49786abf358f34c611fbc3b75f357e336 (patch) | |
| tree | 1664382aa17eb82db6f397d535fff7bd57ac2055 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c2fad9102ca90a25eaec0cb4a9a0b36bcdb67b0e (diff) | |
| parent | 0e152daec325eff736853fbbc0d1cab0822df2e3 (diff) | |
am fbd26467: Merge "DO NOT MERGE" into gingerbread
Merge commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64' into gingerbread-plus-aosp
* commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64':
DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions