diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-12-06 10:42:58 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-06 10:42:58 -0800 |
| commit | 3e327fbdf2f707ab701e9f97c1d5138e90be2ef8 (patch) | |
| tree | 0b58f551214399aeabda9e029818d4c4e9d1049d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 27a3d0065799de36c36a67eec2f386c373b6c39e (diff) | |
| parent | fe1b942d68c5b3a399c8d5872db7f912e51b7a86 (diff) | |
am 18cbfecd: (-s ours) am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
* commit '18cbfecd8ab587fa049dfc668755a6bd6ddb10d9':
DO NOT MERGE Avoid nullifying dhcp target
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions