diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2010-09-23 09:40:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 09:40:20 -0700 |
| commit | 6215bf1a2c8515f7d083dcff7e78be6e62b54c5d (patch) | |
| tree | 653b565a6456c6bc28c77296b7401614aaf2fc2e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 564acdc7bacdffb15d15996f10736f32f1fa7e8f (diff) | |
| parent | 36e39984cbc9f594feeaf5caad83a171d41864b8 (diff) | |
am 9c38a6dc: am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread
Merge commit '9c38a6dc13ba55fccb9c66f347307a1b4ae68105'
* commit '9c38a6dc13ba55fccb9c66f347307a1b4ae68105':
Cleanup Netd to prevent getting hung.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions