diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 11:16:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-24 11:16:39 -0700 |
| commit | 4994521abed9afc4060741d390dc4bcbc8134ffc (patch) | |
| tree | aa39ed32eb607bb6421631722053b8d8a5bd82fa /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 79b4767c7b078c3379d54a102bb46bc6e10fe13f (diff) | |
| parent | 643ad1de510c83610061f7c54593e0dce3517d13 (diff) | |
Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions