diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-10-10 12:21:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-10 12:21:51 -0700 |
| commit | ba18dd9fa9fde068c8aa86d01a4090b8201bf7ff (patch) | |
| tree | 6e184260a05d400c6c5ec20eb741d426dbbf8e6f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 46e92cb3d38ad7b5be293bfc5b586243cf6defd9 (diff) | |
| parent | 353d0832fcf5ecb2af45392e3e903b7999960516 (diff) | |
Merge "fix getmacaddress race condition (don't auto-merge)" into gingerbread
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions