diff options
| author | Benoit Goby <benoit@android.com> | 2011-04-11 18:53:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-11 18:53:57 -0700 |
| commit | f3a0fcc94b57ff72497d9d9812997269c9be54c9 (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e80ff06e1c027e2dba05b406b54196b3e9742160 (diff) | |
| parent | 29d013afa943fb8f4fbd7b7367c0aa6a9884ff32 (diff) | |
am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
Add support for USB Ethernet adapters
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions