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