diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-03 15:23:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-03 15:23:46 -0700 |
| commit | e17367ca4c5a8dc4e27ac801011f41a0c96302f8 (patch) | |
| tree | 6ca016689d76855a34a6cd944e00a19b1cb92bcd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 574c1367ec424d94f285e17b353f7835935b913b (diff) | |
| parent | 38e036340e6c928f4ee75cb7d8824ba436da7d95 (diff) | |
am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready.
Merge commit '69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp
* commit '69717ccd13bb5568b912701ab39d603cfa7091cc':
DO NOT MERGE. Some stuff that is Not Ready.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions