diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 19:54:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-24 19:54:15 -0700 |
| commit | 2225a2ff73b193b1843eac57b197f13bcc0a738a (patch) | |
| tree | 3ad1dbf46ef3a46a3b978a3e1a8fb91ea85dc1bf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 790eab9300f02a6118237035546a1a8782c1dd71 (diff) | |
| parent | f7636e9668f82b6484a0a2b309df9b664c7f6d70 (diff) | |
am bc533dd3: (-s ours) am 18a259fe: am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
* commit 'bc533dd3201afdcf421070cc47250dd7471b77aa':
Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions