diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-03-14 12:10:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 12:10:27 -0700 |
| commit | 937db0dfff9f3056c1f72ff26ec2d5241613f1ba (patch) | |
| tree | 6d362a266557b90295fa9667d58c8e4325085dd7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | aca304bef4b17c9d503d60695dffc1b6fe3e9304 (diff) | |
| parent | 00ff0ca9228ef276adf7fe6f14e24dac07e1d4ba (diff) | |
am fb897110: am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
* commit 'fb8971106e5ea105e176c995c1ff3b4fbe630710':
Backup and restore IP and proxy settings
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions