diff options
| author | Xia Wang <xiaw@google.com> | 2011-04-13 16:05:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-13 16:05:07 -0700 |
| commit | 4849bc5b3d26909307841270082283930f4dc1df (patch) | |
| tree | 0203de19ab6e2bd5591b36fcf88920d05c7f6008 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4a6f0f242701470ce0bc128492ed98b4a2285c45 (diff) | |
| parent | 001edca47a1bd1616c7b8fcab6a9465182186395 (diff) | |
am a4b76ff4: am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
* commit 'a4b76ff4911538f01e92af2f3fa3f4016ad0e290':
Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions