diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 11:19:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-24 11:19:00 -0700 |
| commit | 3493a191b0535b4b79bf128794ca74022219c71e (patch) | |
| tree | aa39ed32eb607bb6421631722053b8d8a5bd82fa /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f6fcd16afed74f7f5c11b3e516a3ce99d94be0b1 (diff) | |
| parent | 4994521abed9afc4060741d390dc4bcbc8134ffc (diff) | |
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 '36ac304c6e62dbb1caaf729c70d7aa956aff63be':
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