diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-10 11:49:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 11:49:43 -0700 |
| commit | e9a1e57d0465fad57a90d25d2c352dfc806f7f76 (patch) | |
| tree | 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a5c99517931f0ed9729685aa0ddcdb60f7a2a277 (diff) | |
| parent | fe80b253ba2c5772ad203ad9ebe0b7b15940bae8 (diff) | |
am 3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost"
Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp
* commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090':
Don't perform DNS lookup in android.net.Proxy.isLocalHost
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions