summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorXia Wang <xiaw@google.com>2011-04-13 15:52:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-13 15:52:39 -0700
commit001edca47a1bd1616c7b8fcab6a9465182186395 (patch)
treea3402cd0e7a2da9b63a6ca702bb7d9c8533bf223 /opengl/tests/gl_basic/gl_basic.cpp
parentfbdf13892693d2a4102abe648196ab9865c88070 (diff)
parent203f6496563a156b73c1ab8841a6a3e12c403517 (diff)
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 'd69ec89f5d31064174d79e2e77504814629cffa6': 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