diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-10-11 10:49:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-11 10:49:39 -0700 |
| commit | 863052f25b14c07489a451804d11bf25aab39ba2 (patch) | |
| tree | dea944ef79b5fba8dac214b522bd2f9a5623b054 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4885054b6d496a39236c72ebaf535f1e96b9467e (diff) | |
| parent | b2b3f12fd712bfbe7db6b485d20a28c596f42edb (diff) | |
am e843dea8: (-s ours) am 7efff5c4: Merge "fix getmacaddress race condition (don\'t auto-merge)" into gingerbread
Merge commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9'
* commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9':
fix getmacaddress race condition (don't auto-merge)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions