diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-10-06 15:29:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-06 15:29:50 -0700 |
| commit | 87b869ece20065ec3b47b350212e51f8cf866ff0 (patch) | |
| tree | f5055b253e0dbd33a72ee9411b96b8815343dd27 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f2cb45d4f8be94d791acfb9e15f35191d6eda996 (diff) | |
| parent | ec8b1a31660c03c68e25efc0eda1fb4a167dc260 (diff) | |
Merge "VPN: temporarily disable the default proxy when VPN is active."
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions