diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-03-14 11:56:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 11:56:03 -0700 |
| commit | 00ff0ca9228ef276adf7fe6f14e24dac07e1d4ba (patch) | |
| tree | aab456746a87080f3777cd2506e94fae18f43931 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ea6193c27550d5a0f23a90f97a6c1f8d02cf791e (diff) | |
| parent | 2de48631414fb8a4dc281c583eaf1b9a3fbe7f7a (diff) | |
am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
* commit '9b1ea0bd2c9af64c424fa4fef327108cb376b74f':
Backup and restore IP and proxy settings
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions